diff options
Diffstat (limited to 'src/Photo.c')
| -rw-r--r-- | src/Photo.c | 30205 |
1 files changed, 15165 insertions, 15040 deletions
diff --git a/src/Photo.c b/src/Photo.c index 1704070..c802450 100644 --- a/src/Photo.c +++ b/src/Photo.c @@ -22,6 +22,7 @@ #include <gee.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <time.h> +#include "shotwell-graphics-processor.h" #include <glib/gstdio.h> #include <float.h> #include <math.h> @@ -291,26 +292,6 @@ typedef struct _BackingPhotoRowClass BackingPhotoRowClass; typedef struct _PhotoBackingReaders PhotoBackingReaders; typedef struct _PhotoBackingReadersClass PhotoBackingReadersClass; -#define TYPE_PIXEL_TRANSFORMER (pixel_transformer_get_type ()) -#define PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformer)) -#define PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass)) -#define IS_PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMER)) -#define IS_PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMER)) -#define PIXEL_TRANSFORMER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass)) - -typedef struct _PixelTransformer PixelTransformer; -typedef struct _PixelTransformerClass PixelTransformerClass; - -#define TYPE_PIXEL_TRANSFORMATION_BUNDLE (pixel_transformation_bundle_get_type ()) -#define PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle)) -#define PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass)) -#define IS_PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE)) -#define IS_PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE)) -#define PIXEL_TRANSFORMATION_BUNDLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass)) - -typedef struct _PixelTransformationBundle PixelTransformationBundle; -typedef struct _PixelTransformationBundleClass PixelTransformationBundleClass; - #define TYPE_ONE_SHOT_SCHEDULER (one_shot_scheduler_get_type ()) #define ONE_SHOT_SCHEDULER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ONE_SHOT_SCHEDULER, OneShotScheduler)) #define ONE_SHOT_SCHEDULER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ONE_SHOT_SCHEDULER, OneShotSchedulerClass)) @@ -344,16 +325,6 @@ typedef struct _PhotoID PhotoID; #define TYPE_ORIENTATION (orientation_get_type ()) -#define TYPE_KEY_VALUE_MAP (key_value_map_get_type ()) -#define KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_KEY_VALUE_MAP, KeyValueMap)) -#define KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_KEY_VALUE_MAP, KeyValueMapClass)) -#define IS_KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_KEY_VALUE_MAP)) -#define IS_KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_KEY_VALUE_MAP)) -#define KEY_VALUE_MAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_KEY_VALUE_MAP, KeyValueMapClass)) - -typedef struct _KeyValueMap KeyValueMap; -typedef struct _KeyValueMapClass KeyValueMapClass; - #define TYPE_BACKING_PHOTO_ID (backing_photo_id_get_type ()) typedef struct _BackingPhotoID BackingPhotoID; typedef struct _BackingPhotoRowPrivate BackingPhotoRowPrivate; @@ -469,6 +440,7 @@ typedef struct _PhotoFileWriterClass PhotoFileWriterClass; typedef struct _PhotoFileMetadataWriter PhotoFileMetadataWriter; typedef struct _PhotoFileMetadataWriterClass PhotoFileMetadataWriterClass; +#define _g_bytes_unref0(var) ((var == NULL) ? NULL : (var = (g_bytes_unref (var), NULL))) #define TYPE_EXPORT_FORMAT_PARAMETERS (export_format_parameters_get_type ()) @@ -586,18 +558,6 @@ typedef struct _LibraryPhotoClass LibraryPhotoClass; #define TYPE_BOX (box_get_type ()) typedef struct _Box Box; #define _key_value_map_unref0(var) ((var == NULL) ? NULL : (var = (key_value_map_unref (var), NULL))) - -#define TYPE_PIXEL_TRANSFORMATION_TYPE (pixel_transformation_type_get_type ()) - -#define TYPE_PIXEL_TRANSFORMATION (pixel_transformation_get_type ()) -#define PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformation)) -#define PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass)) -#define IS_PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION)) -#define IS_PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION)) -#define PIXEL_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass)) - -typedef struct _PixelTransformation PixelTransformation; -typedef struct _PixelTransformationClass PixelTransformationClass; #define _pixel_transformation_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_unref (var), NULL))) #define PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL (photo_photo_transformation_state_impl_get_type ()) @@ -1445,17 +1405,6 @@ struct _Box { gint bottom; }; -typedef enum { - PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION, - PIXEL_TRANSFORMATION_TYPE_SHADOWS, - PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS, - PIXEL_TRANSFORMATION_TYPE_TEMPERATURE, - PIXEL_TRANSFORMATION_TYPE_TINT, - PIXEL_TRANSFORMATION_TYPE_SATURATION, - PIXEL_TRANSFORMATION_TYPE_EXPOSURE, - PIXEL_TRANSFORMATION_TYPE_CONTRAST -} PixelTransformationType; - struct _EditingToolsRedeyeInstance { GdkPoint center; gint radius; @@ -1925,20 +1874,6 @@ static void photo_value_set_backing_readers (GValue* value, gpointer v_object) G static void photo_value_take_backing_readers (GValue* value, gpointer v_object) G_GNUC_UNUSED; static gpointer photo_value_get_backing_readers (const GValue* value) G_GNUC_UNUSED; static GType photo_backing_readers_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -gpointer pixel_transformer_ref (gpointer instance); -void pixel_transformer_unref (gpointer instance); -GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_pixel_transformer (GValue* value, gpointer v_object); -void value_take_pixel_transformer (GValue* value, gpointer v_object); -gpointer value_get_pixel_transformer (const GValue* value); -GType pixel_transformer_get_type (void) G_GNUC_CONST; -gpointer pixel_transformation_bundle_ref (gpointer instance); -void pixel_transformation_bundle_unref (gpointer instance); -GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object); -void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object); -gpointer value_get_pixel_transformation_bundle (const GValue* value); -GType pixel_transformation_bundle_get_type (void) G_GNUC_CONST; gpointer one_shot_scheduler_ref (gpointer instance); void one_shot_scheduler_unref (gpointer instance); GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -1978,13 +1913,6 @@ GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); GType orientation_get_type (void) G_GNUC_CONST; -gpointer key_value_map_ref (gpointer instance); -void key_value_map_unref (gpointer instance); -GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_key_value_map (GValue* value, gpointer v_object); -void value_take_key_value_map (GValue* value, gpointer v_object); -gpointer value_get_key_value_map (const GValue* value); -GType key_value_map_get_type (void) G_GNUC_CONST; GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); void backing_photo_id_free (BackingPhotoID* self); @@ -2056,7 +1984,7 @@ gpointer value_get_photo_preview (const GValue* value); GType photo_preview_get_type (void) G_GNUC_CONST; PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number); void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result); -void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, GError** error); +void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, gboolean notify, GError** error); void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, BackingPhotoRow* bpr, GError** error); void data_object_notify_altered (DataObject* self, Alteration* alteration); Alteration* alteration_new (const gchar* subject, const gchar* detail); @@ -2085,7 +2013,7 @@ gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* Orientation photo_metadata_get_orientation (PhotoMetadata* self); void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, GError** error); void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error); -static void photo_develop_photo (Photo* self, RawDeveloper d); +static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify); BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error); GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error); void scaling_for_original (Scaling* result); @@ -2097,9 +2025,11 @@ void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQual GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error); void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error); +GBytes* photo_preview_flatten (PhotoPreview* self, GError** error); +gboolean jpeg_is_jpeg_bytes (GBytes* bytes, GError** error); GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error); void photo_set_default_raw_developer (Photo* self, RawDeveloper d); -void photo_set_raw_developer (Photo* self, RawDeveloper d); +void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify); void photo_revert_to_master (Photo* self, gboolean notify); GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error); gboolean photo_set_orientation (Photo* self, Orientation orientation); @@ -2111,12 +2041,12 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d); static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, int* result_length1); BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, const gchar* md5); BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, BackingPhotoRow* photo_row, const gchar* md5); -static void _vala_array_add85 (BackingFileState** * array, int* length, int* size, BackingFileState* value); +static void _vala_array_add89 (BackingFileState** * array, int* length, int* size, BackingFileState* value); gboolean photo_has_editable (Photo* self); -static void _vala_array_add86 (BackingFileState** * array, int* length, int* size, BackingFileState* value); +static void _vala_array_add90 (BackingFileState** * array, int* length, int* size, BackingFileState* value); gboolean photo_is_developed (Photo* self); GeeCollection* photo_get_raw_development_photo_rows (Photo* self); -static void _vala_array_add87 (BackingFileState** * array, int* length, int* size, BackingFileState* value); +static void _vala_array_add91 (BackingFileState** * array, int* length, int* size, BackingFileState* value); static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode); static PhotoFileReader* photo_get_master_reader (Photo* self); static PhotoFileReader* photo_get_baseline_reader (Photo* self); @@ -2184,12 +2114,12 @@ void photo_value_take_reimport_master_state (GValue* value, gpointer v_object); gpointer photo_value_get_reimport_master_state (const GValue* value); GType photo_reimport_master_state_get_type (void) G_GNUC_CONST; gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error); -static void _vala_array_add88 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add89 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add90 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add91 (gchar** * array, int* length, int* size, gchar* value); static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value); static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value); static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1); static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct (GType object_type, PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1); static GType photo_reimport_master_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; @@ -2198,8 +2128,8 @@ static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetad void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error); void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error); void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from); -static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value); Alteration* alteration_new_from_array (gchar** array, int array_length1); Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1); static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow* * backing, DetectedPhotoInformation* * detected, GError** error); @@ -2278,15 +2208,15 @@ static GFile* photo_real_get_file (MediaSource* base); void photo_set_master_file (Photo* self, GFile* file); void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error); void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file); -static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value); -void photo_set_editable_file (Photo* self, GFile* file); -void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error); static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value); static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value); static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value); +void photo_set_editable_file (Photo* self, GFile* file); +void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error); +static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value); void photo_set_many_editable_file (GeeMap* map, GError** error); GFile* photo_get_actual_file (Photo* self); static GFile* photo_real_get_master_file (MediaSource* base); @@ -2371,35 +2301,14 @@ void box_free (Box* self); gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions); void box_get_dimensions (Box *self, Dimensions* result); static void photo_locked_create_adjustments_from_data (Photo* self); -PixelTransformationBundle* pixel_transformation_bundle_new (void); -PixelTransformationBundle* pixel_transformation_bundle_construct (GType object_type); static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name); -void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* self); -void pixel_transformation_bundle_load (PixelTransformationBundle* self, KeyValueMap* store); -PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransformationBundle* self); PixelTransformationBundle* photo_get_color_adjustments (Photo* self); -PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformationBundle* self); PixelTransformer* photo_get_pixel_transformer (Photo* self); -PixelTransformer* pixel_transformer_copy (PixelTransformer* self); gboolean photo_has_color_adjustments (Photo* self); static gboolean photo_has_transformation (Photo* self, const gchar* name); -GType pixel_transformation_type_get_type (void) G_GNUC_CONST; -gpointer pixel_transformation_ref (gpointer instance); -void pixel_transformation_unref (gpointer instance); -GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_pixel_transformation (GValue* value, gpointer v_object); -void value_take_pixel_transformation (GValue* value, gpointer v_object); -gpointer value_get_pixel_transformation (const GValue* value); -GType pixel_transformation_get_type (void) G_GNUC_CONST; PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformationType type); -PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self, PixelTransformationType type); void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_adjustments); -gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* self); static gboolean photo_remove_transformation (Photo* self, const gchar* name); -KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self, const gchar* group); -GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformationBundle* self); -void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTransformation* old_trans, PixelTransformation* new_trans); -PixelTransformationType pixel_transformation_get_transformation_type (PixelTransformation* self); static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans); static PhotoMetadata* photo_real_get_metadata (PhotoSource* base); PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error); @@ -2431,30 +2340,20 @@ gboolean photo_check_can_rotate (Photo* self); void photo_rotate (Photo* self, Rotation rotation); static void photo_real_rotate (Photo* self, Rotation rotation); Orientation orientation_perform (Orientation self, Rotation rotation); -KeyValueMap* key_value_map_copy (KeyValueMap* self); -gchar* key_value_map_get_group (KeyValueMap* self); gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map); gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object); gboolean photo_has_crop (Photo* self); gboolean photo_get_raw_crop (Photo* self, Box* crop); void box_init (Box *self, gint left, gint top, gint right, gint bottom); -gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def); static void photo_set_raw_crop (Photo* self, Box* crop); -KeyValueMap* key_value_map_new (const gchar* group); -KeyValueMap* key_value_map_construct (GType object_type, const gchar* group); -void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value); static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle); -gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble def); static void photo_set_raw_straighten (Photo* self, gdouble theta); -void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble value); GType editing_tools_redeye_instance_get_type (void) G_GNUC_CONST; EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self); void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self); static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, int* result_length1); -void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result); gboolean photo_has_redeye_transformations (Photo* self); void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye); -void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point); static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling, PhotoException exceptions, Dimensions* scaled_image, Dimensions* scaled_to_viewport); static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling, PhotoException exceptions, Dimensions* scaled_image, Dimensions* scaled_to_viewport); gboolean scaling_is_unscaled (Scaling *self); @@ -2487,7 +2386,6 @@ void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_s gboolean dimensions_equals (Dimensions *self, Dimensions* dim); static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsRedeyeInstance* inst); GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle); -void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixbuf, GCancellable* cancellable); gboolean photo_has_user_generated_metadata (Photo* self); static gboolean photo_real_has_user_generated_metadata (Photo* self); void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata); @@ -2539,12 +2437,12 @@ static void photo_update_editable_attributes (Photo* self, GError** error); void photo_reimport_editable (Photo* self, GError** error); void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error); void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error); -static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value); static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value); static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add109 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add110 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add111 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add112 (gchar** * array, int* length, int* size, gchar* value); void backing_photo_id_init (BackingPhotoID *self, gint64 id); const gchar* g_file_monitor_event_to_string (GFileMonitorEvent self); static void photo_on_reimport_editable (Photo* self); @@ -2566,7 +2464,6 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint* point, GdkPoint* result); void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRectangle* result); PixelTransformationBundle* photo_get_enhance_transformations (Photo* self); -PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixbuf* pixbuf); gboolean photo_enhance (Photo* self); void photo_set_develop_raw_photos_to_files (gboolean value); static void photo_real_editable_replaced (Photo* self, GFile* old_file, GFile* new_file); @@ -2602,7 +2499,7 @@ static void photo_reimport_master_state_finalize (PhotoReimportMasterState * obj enum { PHOTO_REIMPORT_MASTER_STATE_IMPL_DUMMY_PROPERTY }; -static gchar** _vala_array_dup28 (gchar** self, int length); +static gchar** _vala_array_dup24 (gchar** self, int length); static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj); enum { PHOTO_REIMPORT_EDITABLE_STATE_DUMMY_PROPERTY @@ -2908,14 +2805,14 @@ GType backing_fetch_mode_get_type (void) { static gpointer _g_object_ref0 (gpointer self) { #line 41 "/home/jens/Source/shotwell/src/Photo.vala" return self ? g_object_ref (self) : NULL; -#line 2912 "Photo.c" +#line 2809 "Photo.c" } static gpointer _thumbnails_ref0 (gpointer self) { #line 48 "/home/jens/Source/shotwell/src/Photo.vala" return self ? thumbnails_ref (self) : NULL; -#line 2919 "Photo.c" +#line 2816 "Photo.c" } @@ -3003,14 +2900,14 @@ PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file self->thumbnails = _tmp13_; #line 38 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 3007 "Photo.c" +#line 2904 "Photo.c" } PhotoImportParams* photo_import_params_new (GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails) { #line 38 "/home/jens/Source/shotwell/src/Photo.vala" return photo_import_params_construct (TYPE_PHOTO_IMPORT_PARAMS, file, final_associated_file, import_id, sniffer_options, exif_md5, thumbnail_md5, full_md5, thumbnails); -#line 3014 "Photo.c" +#line 2911 "Photo.c" } @@ -3057,21 +2954,21 @@ PhotoImportParams* photo_import_params_construct_create_placeholder (GType objec self->thumbnails = NULL; #line 52 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 3061 "Photo.c" +#line 2958 "Photo.c" } PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id) { #line 52 "/home/jens/Source/shotwell/src/Photo.vala" return photo_import_params_construct_create_placeholder (TYPE_PHOTO_IMPORT_PARAMS, file, import_id); -#line 3068 "Photo.c" +#line 2965 "Photo.c" } static void value_photo_import_params_init (GValue* value) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 3075 "Photo.c" +#line 2972 "Photo.c" } @@ -3080,7 +2977,7 @@ static void value_photo_import_params_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" photo_import_params_unref (value->data[0].v_pointer); -#line 3084 "Photo.c" +#line 2981 "Photo.c" } } @@ -3090,11 +2987,11 @@ static void value_photo_import_params_copy_value (const GValue* src_value, GValu if (src_value->data[0].v_pointer) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_import_params_ref (src_value->data[0].v_pointer); -#line 3094 "Photo.c" +#line 2991 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 3098 "Photo.c" +#line 2995 "Photo.c" } } @@ -3102,37 +2999,37 @@ static void value_photo_import_params_copy_value (const GValue* src_value, GValu static gpointer value_photo_import_params_peek_pointer (const GValue* value) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 3106 "Photo.c" +#line 3003 "Photo.c" } static gchar* value_photo_import_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 3113 "Photo.c" +#line 3010 "Photo.c" PhotoImportParams * object; object = collect_values[0].v_pointer; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3120 "Photo.c" +#line 3017 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3124 "Photo.c" +#line 3021 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_import_params_ref (object); -#line 3128 "Photo.c" +#line 3025 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 3132 "Photo.c" +#line 3029 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 3136 "Photo.c" +#line 3033 "Photo.c" } @@ -3143,25 +3040,25 @@ static gchar* value_photo_import_params_lcopy_value (const GValue* value, guint if (!object_p) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3147 "Photo.c" +#line 3044 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 3153 "Photo.c" +#line 3050 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 3157 "Photo.c" +#line 3054 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_import_params_ref (value->data[0].v_pointer); -#line 3161 "Photo.c" +#line 3058 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 3165 "Photo.c" +#line 3062 "Photo.c" } @@ -3175,7 +3072,7 @@ GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 3179 "Photo.c" +#line 3076 "Photo.c" } @@ -3184,7 +3081,7 @@ gpointer value_get_photo_import_params (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS), NULL); #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 3188 "Photo.c" +#line 3085 "Photo.c" } @@ -3204,17 +3101,17 @@ void value_set_photo_import_params (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" photo_import_params_ref (value->data[0].v_pointer); -#line 3208 "Photo.c" +#line 3105 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 3212 "Photo.c" +#line 3109 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" photo_import_params_unref (old); -#line 3218 "Photo.c" +#line 3115 "Photo.c" } } @@ -3233,17 +3130,17 @@ void value_take_photo_import_params (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 3237 "Photo.c" +#line 3134 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 3241 "Photo.c" +#line 3138 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" photo_import_params_unref (old); -#line 3247 "Photo.c" +#line 3144 "Photo.c" } } @@ -3253,7 +3150,7 @@ static void photo_import_params_class_init (PhotoImportParamsClass * klass) { photo_import_params_parent_class = g_type_class_peek_parent (klass); #line 21 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoImportParamsClass *) klass)->finalize = photo_import_params_finalize; -#line 3257 "Photo.c" +#line 3154 "Photo.c" } @@ -3269,7 +3166,7 @@ static void photo_import_params_instance_init (PhotoImportParams * self) { self->keywords = NULL; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 3273 "Photo.c" +#line 3170 "Photo.c" } @@ -3295,7 +3192,7 @@ static void photo_import_params_finalize (PhotoImportParams * obj) { _photo_row_unref0 (self->row); #line 36 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->keywords); -#line 3299 "Photo.c" +#line 3196 "Photo.c" } @@ -3320,7 +3217,7 @@ gpointer photo_import_params_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 3324 "Photo.c" +#line 3221 "Photo.c" } @@ -3333,7 +3230,7 @@ void photo_import_params_unref (gpointer instance) { PHOTO_IMPORT_PARAMS_GET_CLASS (self)->finalize (self); #line 21 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3337 "Photo.c" +#line 3234 "Photo.c" } } @@ -3344,7 +3241,7 @@ PhotoTransformationState* photo_transformation_state_construct (GType object_typ self = (PhotoTransformationState*) g_object_new (object_type, NULL); #line 72 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 3348 "Photo.c" +#line 3245 "Photo.c" } @@ -3359,14 +3256,14 @@ gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) { result = _tmp0_; #line 76 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3363 "Photo.c" +#line 3260 "Photo.c" } static void photo_transformation_state_real_broken (PhotoTransformationState* self) { #line 69 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->is_broke = TRUE; -#line 3370 "Photo.c" +#line 3267 "Photo.c" } @@ -3381,7 +3278,7 @@ static void photo_transformation_state_class_init (PhotoTransformationStateClass G_OBJECT_CLASS (klass)->finalize = photo_transformation_state_finalize; #line 63 "/home/jens/Source/shotwell/src/Photo.vala" photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoTransformationStateClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3385 "Photo.c" +#line 3282 "Photo.c" } @@ -3390,7 +3287,7 @@ static void photo_transformation_state_instance_init (PhotoTransformationState * self->priv = PHOTO_TRANSFORMATION_STATE_GET_PRIVATE (self); #line 64 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->is_broke = FALSE; -#line 3394 "Photo.c" +#line 3291 "Photo.c" } @@ -3400,7 +3297,7 @@ static void photo_transformation_state_finalize (GObject * obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState); #line 63 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (photo_transformation_state_parent_class)->finalize (obj); -#line 3404 "Photo.c" +#line 3301 "Photo.c" } @@ -3422,7 +3319,7 @@ gboolean rating_can_increase (Rating self) { result = self < RATING_FIVE; #line 90 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3426 "Photo.c" +#line 3323 "Photo.c" } @@ -3432,7 +3329,7 @@ gboolean rating_can_decrease (Rating self) { result = self > RATING_REJECTED; #line 94 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3436 "Photo.c" +#line 3333 "Photo.c" } @@ -3443,17 +3340,17 @@ gboolean rating_is_valid (Rating self) { if (self >= RATING_REJECTED) { #line 98 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self <= RATING_FIVE; -#line 3447 "Photo.c" +#line 3344 "Photo.c" } else { #line 98 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 3451 "Photo.c" +#line 3348 "Photo.c" } #line 98 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 98 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3457 "Photo.c" +#line 3354 "Photo.c" } @@ -3467,17 +3364,17 @@ Rating rating_increase (Rating self) { if (_tmp1_) { #line 102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self + 1; -#line 3471 "Photo.c" +#line 3368 "Photo.c" } else { #line 102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self; -#line 3475 "Photo.c" +#line 3372 "Photo.c" } #line 102 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 102 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3481 "Photo.c" +#line 3378 "Photo.c" } @@ -3491,17 +3388,17 @@ Rating rating_decrease (Rating self) { if (_tmp1_) { #line 106 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self - 1; -#line 3495 "Photo.c" +#line 3392 "Photo.c" } else { #line 106 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self; -#line 3499 "Photo.c" +#line 3396 "Photo.c" } #line 106 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 106 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3505 "Photo.c" +#line 3402 "Photo.c" } @@ -3511,73 +3408,73 @@ gint rating_serialize (Rating self) { switch (self) { #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_REJECTED: -#line 3515 "Photo.c" +#line 3412 "Photo.c" { #line 112 "/home/jens/Source/shotwell/src/Photo.vala" result = -1; #line 112 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3521 "Photo.c" +#line 3418 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_UNRATED: -#line 3525 "Photo.c" +#line 3422 "Photo.c" { #line 114 "/home/jens/Source/shotwell/src/Photo.vala" result = 0; #line 114 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3531 "Photo.c" +#line 3428 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_ONE: -#line 3535 "Photo.c" +#line 3432 "Photo.c" { #line 116 "/home/jens/Source/shotwell/src/Photo.vala" result = 1; #line 116 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3541 "Photo.c" +#line 3438 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_TWO: -#line 3545 "Photo.c" +#line 3442 "Photo.c" { #line 118 "/home/jens/Source/shotwell/src/Photo.vala" result = 2; #line 118 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3551 "Photo.c" +#line 3448 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_THREE: -#line 3555 "Photo.c" +#line 3452 "Photo.c" { #line 120 "/home/jens/Source/shotwell/src/Photo.vala" result = 3; #line 120 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3561 "Photo.c" +#line 3458 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_FOUR: -#line 3565 "Photo.c" +#line 3462 "Photo.c" { #line 122 "/home/jens/Source/shotwell/src/Photo.vala" result = 4; #line 122 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3571 "Photo.c" +#line 3468 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_FIVE: -#line 3575 "Photo.c" +#line 3472 "Photo.c" { #line 124 "/home/jens/Source/shotwell/src/Photo.vala" result = 5; #line 124 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3581 "Photo.c" +#line 3478 "Photo.c" } default: { @@ -3585,7 +3482,7 @@ gint rating_serialize (Rating self) { result = 0; #line 126 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3589 "Photo.c" +#line 3486 "Photo.c" } } } @@ -3603,7 +3500,7 @@ Rating rating_unserialize (gint value) { result = RATING_FIVE; #line 132 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3607 "Photo.c" +#line 3504 "Photo.c" } else { gint _tmp1_; #line 133 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3614,7 +3511,7 @@ Rating rating_unserialize (gint value) { result = RATING_REJECTED; #line 134 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3618 "Photo.c" +#line 3515 "Photo.c" } } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3623,73 +3520,73 @@ Rating rating_unserialize (gint value) { switch (_tmp2_) { #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case -1: -#line 3627 "Photo.c" +#line 3524 "Photo.c" { #line 138 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_REJECTED; #line 138 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3633 "Photo.c" +#line 3530 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 0: -#line 3637 "Photo.c" +#line 3534 "Photo.c" { #line 140 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_UNRATED; #line 140 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3643 "Photo.c" +#line 3540 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 1: -#line 3647 "Photo.c" +#line 3544 "Photo.c" { #line 142 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_ONE; #line 142 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3653 "Photo.c" +#line 3550 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 2: -#line 3657 "Photo.c" +#line 3554 "Photo.c" { #line 144 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_TWO; #line 144 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3663 "Photo.c" +#line 3560 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 3: -#line 3667 "Photo.c" +#line 3564 "Photo.c" { #line 146 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_THREE; #line 146 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3673 "Photo.c" +#line 3570 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 4: -#line 3677 "Photo.c" +#line 3574 "Photo.c" { #line 148 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_FOUR; #line 148 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3683 "Photo.c" +#line 3580 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 5: -#line 3687 "Photo.c" +#line 3584 "Photo.c" { #line 150 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_FIVE; #line 150 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3693 "Photo.c" +#line 3590 "Photo.c" } default: { @@ -3697,7 +3594,7 @@ Rating rating_unserialize (gint value) { result = RATING_UNRATED; #line 152 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3701 "Photo.c" +#line 3598 "Photo.c" } } } @@ -3724,7 +3621,7 @@ gboolean photo_exception_prohibits (PhotoException self, PhotoException exceptio result = (self & _tmp0_) != 0; #line 228 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3728 "Photo.c" +#line 3625 "Photo.c" } @@ -3737,7 +3634,7 @@ gboolean photo_exception_allows (PhotoException self, PhotoException exception) result = (self & _tmp0_) == 0; #line 232 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3741 "Photo.c" +#line 3638 "Photo.c" } @@ -3756,14 +3653,14 @@ GType photo_exception_get_type (void) { static gpointer _photo_row_ref0 (gpointer self) { #line 400 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_row_ref (self) : NULL; -#line 3760 "Photo.c" +#line 3657 "Photo.c" } static gpointer _backing_photo_row_ref0 (gpointer self) { #line 421 "/home/jens/Source/shotwell/src/Photo.vala" return self ? backing_photo_row_ref (self) : NULL; -#line 3767 "Photo.c" +#line 3664 "Photo.c" } @@ -3880,7 +3777,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp22_ = basename; #line 412 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_ != NULL) { -#line 3884 "Photo.c" +#line 3781 "Photo.c" const gchar* _tmp23_; gchar* _tmp24_; #line 413 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3891,7 +3788,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _g_free0 (self->priv->file_title); #line 413 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->file_title = _tmp24_; -#line 3895 "Photo.c" +#line 3792 "Photo.c" } #line 415 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->priv->file_title; @@ -3899,7 +3796,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp26_ = is_string_empty (_tmp25_); #line 415 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp26_) { -#line 3903 "Photo.c" +#line 3800 "Photo.c" PhotoRow* _tmp27_; BackingPhotoRow* _tmp28_; const gchar* _tmp29_; @@ -3916,7 +3813,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _g_free0 (self->priv->file_title); #line 416 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->file_title = _tmp30_; -#line 3920 "Photo.c" +#line 3817 "Photo.c" } #line 418 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = row; @@ -3926,7 +3823,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp33_ = _tmp32_.id; #line 418 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp33_ != BACKING_PHOTO_ID_INVALID) { -#line 3930 "Photo.c" +#line 3827 "Photo.c" BackingPhotoRow* e = NULL; PhotoRow* _tmp34_; BackingPhotoID _tmp35_; @@ -3944,7 +3841,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp37_ = e; #line 420 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp37_ != NULL) { -#line 3948 "Photo.c" +#line 3845 "Photo.c" BackingPhotoRow* _tmp38_; BackingPhotoRow* _tmp39_; PhotoBackingReaders* _tmp40_; @@ -3977,7 +3874,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _photo_file_adapter_unref0 (_tmp40_->editable); #line 422 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_->editable = _tmp45_; -#line 3981 "Photo.c" +#line 3878 "Photo.c" } else { { PhotoTable* _tmp46_; @@ -3997,8 +3894,8 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 425 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 4001 "Photo.c" - goto __catch257_database_error; +#line 3898 "Photo.c" + goto __catch268_database_error; } #line 425 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (e); @@ -4010,11 +3907,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { g_clear_error (&_inner_error_); #line 425 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4014 "Photo.c" +#line 3911 "Photo.c" } } - goto __finally257; - __catch257_database_error: + goto __finally268; + __catch268_database_error: { GError* err = NULL; #line 424 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4023,9 +3920,9 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _inner_error_ = NULL; #line 424 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 4027 "Photo.c" +#line 3924 "Photo.c" } - __finally257: + __finally268: #line 424 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 424 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4038,15 +3935,15 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { g_clear_error (&_inner_error_); #line 424 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4042 "Photo.c" +#line 3939 "Photo.c" } #line 432 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 4046 "Photo.c" +#line 3943 "Photo.c" } #line 418 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (e); -#line 4050 "Photo.c" +#line 3947 "Photo.c" } #line 436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = row; @@ -4056,7 +3953,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp51_ = _tmp50_->file_format; #line 436 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp51_ == PHOTO_FILE_FORMAT_RAW) { -#line 4060 "Photo.c" +#line 3957 "Photo.c" GeeHashMap* _tmp52_; gint _tmp53_; RawDeveloper* _tmp54_; @@ -4068,7 +3965,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { self->priv->developments = _tmp52_; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = raw_developer_as_array (&_tmp53_); -#line 4072 "Photo.c" +#line 3969 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; @@ -4080,11 +3977,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { d_collection_length1 = _tmp53_; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" for (d_it = 0; d_it < _tmp53_; d_it = d_it + 1) { -#line 4084 "Photo.c" +#line 3981 "Photo.c" RawDeveloper d = 0; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 4088 "Photo.c" +#line 3985 "Photo.c" { BackingPhotoID id = {0}; PhotoRow* _tmp55_; @@ -4112,7 +4009,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp60_ = _tmp59_.id; #line 441 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp60_ != BACKING_PHOTO_ID_INVALID) { -#line 4116 "Photo.c" +#line 4013 "Photo.c" BackingPhotoRow* bpr = NULL; BackingPhotoID _tmp61_; BackingPhotoRow* _tmp62_; @@ -4127,7 +4024,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp63_ = bpr; #line 443 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp63_ != NULL) { -#line 4131 "Photo.c" +#line 4028 "Photo.c" GeeHashMap* _tmp64_; RawDeveloper _tmp65_; BackingPhotoRow* _tmp66_; @@ -4139,17 +4036,17 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp66_ = bpr; #line 444 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp65_), _tmp66_); -#line 4143 "Photo.c" +#line 4040 "Photo.c" } #line 441 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 4147 "Photo.c" +#line 4044 "Photo.c" } } } #line 439 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 4153 "Photo.c" +#line 4050 "Photo.c" } } #line 450 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4160,7 +4057,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp70_ = _tmp69_->file_format; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp70_ == PHOTO_FILE_FORMAT_RAW) { -#line 4164 "Photo.c" +#line 4061 "Photo.c" GeeHashMap* _tmp71_; PhotoRow* _tmp72_; RawDeveloper _tmp73_; @@ -4175,15 +4072,15 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp74_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp73_)); #line 450 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = _tmp74_; -#line 4179 "Photo.c" +#line 4076 "Photo.c" } else { #line 450 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = FALSE; -#line 4183 "Photo.c" +#line 4080 "Photo.c" } #line 450 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp67_) { -#line 4187 "Photo.c" +#line 4084 "Photo.c" BackingPhotoRow* r = NULL; GeeHashMap* _tmp75_; PhotoRow* _tmp76_; @@ -4223,7 +4120,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp79_->developer = _tmp84_; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (r); -#line 4227 "Photo.c" +#line 4124 "Photo.c" } #line 456 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = self->priv->readers; @@ -4231,7 +4128,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp86_ = _tmp85_->editable; #line 456 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp86_ != NULL) { -#line 4235 "Photo.c" +#line 4132 "Photo.c" BackingPhotoRow* _tmp87_; BackingPhotoRow* _tmp88_; #line 457 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4242,7 +4139,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _backing_photo_row_unref0 (self->backing_photo_row); #line 457 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = _tmp88_; -#line 4246 "Photo.c" +#line 4143 "Photo.c" } else { PhotoRow* _tmp89_; BackingPhotoRow* _tmp90_; @@ -4255,7 +4152,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp91_ = _tmp90_->file_format; #line 458 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp91_ != PHOTO_FILE_FORMAT_RAW) { -#line 4259 "Photo.c" +#line 4156 "Photo.c" PhotoRow* _tmp92_; BackingPhotoRow* _tmp93_; BackingPhotoRow* _tmp94_; @@ -4269,7 +4166,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _backing_photo_row_unref0 (self->backing_photo_row); #line 459 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = _tmp94_; -#line 4273 "Photo.c" +#line 4170 "Photo.c" } else { GeeHashMap* _tmp95_; PhotoRow* _tmp96_; @@ -4285,7 +4182,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp98_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp97_)); #line 463 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp98_) { -#line 4289 "Photo.c" +#line 4186 "Photo.c" GeeHashMap* _tmp99_; PhotoRow* _tmp100_; RawDeveloper _tmp101_; @@ -4302,7 +4199,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _backing_photo_row_unref0 (self->backing_photo_row); #line 464 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = (BackingPhotoRow*) _tmp102_; -#line 4306 "Photo.c" +#line 4203 "Photo.c" } else { PhotoRow* _tmp103_; BackingPhotoRow* _tmp104_; @@ -4317,7 +4214,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _backing_photo_row_unref0 (self->backing_photo_row); #line 467 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = _tmp105_; -#line 4321 "Photo.c" +#line 4218 "Photo.c" } } } @@ -4331,7 +4228,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _g_free0 (basename); #line 399 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 4335 "Photo.c" +#line 4232 "Photo.c" } @@ -4343,7 +4240,7 @@ void photo_init_photo (void) { _g_object_unref0 (photo_source_pixbuf_cache); #line 475 "/home/jens/Source/shotwell/src/Photo.vala" photo_source_pixbuf_cache = _tmp0_; -#line 4347 "Photo.c" +#line 4244 "Photo.c" } @@ -4357,7 +4254,7 @@ void photo_terminate_photo (void) { _tmp0_ = photo_discard_source_id; #line 481 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != ((guint) 0)) { -#line 4361 "Photo.c" +#line 4258 "Photo.c" guint _tmp1_; #line 482 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_discard_source_id; @@ -4365,7 +4262,7 @@ void photo_terminate_photo (void) { g_source_remove (_tmp1_); #line 483 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_source_id = (guint) 0; -#line 4369 "Photo.c" +#line 4266 "Photo.c" } } @@ -4383,7 +4280,7 @@ static void photo_real_notify_editable_replaced (Photo* self, GFile* old_file, G _tmp1_ = new_file; #line 488 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REPLACED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 4387 "Photo.c" +#line 4284 "Photo.c" } @@ -4392,14 +4289,14 @@ void photo_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_fi g_return_if_fail (IS_PHOTO (self)); #line 487 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_editable_replaced (self, old_file, new_file); -#line 4396 "Photo.c" +#line 4293 "Photo.c" } static void photo_real_notify_raw_development_modified (Photo* self) { #line 492 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, photo_signals[PHOTO_RAW_DEVELOPMENT_MODIFIED_SIGNAL], 0); -#line 4403 "Photo.c" +#line 4300 "Photo.c" } @@ -4408,14 +4305,14 @@ void photo_notify_raw_development_modified (Photo* self) { g_return_if_fail (IS_PHOTO (self)); #line 491 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_raw_development_modified (self); -#line 4412 "Photo.c" +#line 4309 "Photo.c" } static void photo_real_notify_baseline_replaced (Photo* self) { #line 496 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, photo_signals[PHOTO_BASELINE_REPLACED_SIGNAL], 0); -#line 4419 "Photo.c" +#line 4316 "Photo.c" } @@ -4424,7 +4321,7 @@ void photo_notify_baseline_replaced (Photo* self) { g_return_if_fail (IS_PHOTO (self)); #line 495 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_baseline_replaced (self); -#line 4428 "Photo.c" +#line 4325 "Photo.c" } @@ -4436,7 +4333,7 @@ static void photo_real_notify_master_reimported (Photo* self, PhotoMetadata* met _tmp0_ = metadata; #line 500 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, photo_signals[PHOTO_MASTER_REIMPORTED_SIGNAL], 0, _tmp0_); -#line 4440 "Photo.c" +#line 4337 "Photo.c" } @@ -4445,7 +4342,7 @@ void photo_notify_master_reimported (Photo* self, PhotoMetadata* metadata) { g_return_if_fail (IS_PHOTO (self)); #line 499 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_master_reimported (self, metadata); -#line 4449 "Photo.c" +#line 4346 "Photo.c" } @@ -4457,7 +4354,7 @@ static void photo_real_notify_editable_reimported (Photo* self, PhotoMetadata* m _tmp0_ = metadata; #line 504 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REIMPORTED_SIGNAL], 0, _tmp0_); -#line 4461 "Photo.c" +#line 4358 "Photo.c" } @@ -4466,7 +4363,7 @@ void photo_notify_editable_reimported (Photo* self, PhotoMetadata* metadata) { g_return_if_fail (IS_PHOTO (self)); #line 503 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_editable_reimported (self, metadata); -#line 4470 "Photo.c" +#line 4367 "Photo.c" } @@ -4478,7 +4375,7 @@ static void photo_real_notify_source_reimported (Photo* self, PhotoMetadata* met _tmp0_ = metadata; #line 508 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL], 0, _tmp0_); -#line 4482 "Photo.c" +#line 4379 "Photo.c" } @@ -4487,7 +4384,7 @@ void photo_notify_source_reimported (Photo* self, PhotoMetadata* metadata) { g_return_if_fail (IS_PHOTO (self)); #line 507 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_source_reimported (self, metadata); -#line 4491 "Photo.c" +#line 4388 "Photo.c" } @@ -4499,7 +4396,7 @@ static void photo_real_notify_baseline_reimported (Photo* self, PhotoMetadata* m _tmp0_ = metadata; #line 512 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, photo_signals[PHOTO_BASELINE_REIMPORTED_SIGNAL], 0, _tmp0_); -#line 4503 "Photo.c" +#line 4400 "Photo.c" } @@ -4508,7 +4405,7 @@ void photo_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata) { g_return_if_fail (IS_PHOTO (self)); #line 511 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->notify_baseline_reimported (self, metadata); -#line 4512 "Photo.c" +#line 4409 "Photo.c" } @@ -4529,14 +4426,14 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e ret = TRUE; #line 517 "/home/jens/Source/shotwell/src/Photo.vala" file = NULL; -#line 4533 "Photo.c" +#line 4430 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 4540 "Photo.c" +#line 4437 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -4546,7 +4443,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _tmp2_ = _tmp1_->editable; #line 519 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 4550 "Photo.c" +#line 4447 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; GFile* _tmp5_; @@ -4560,21 +4457,21 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _g_object_unref0 (file); #line 520 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp5_; -#line 4564 "Photo.c" +#line 4461 "Photo.c" } } - __finally258: + __finally269: { PhotoBackingReaders* _tmp6_; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->readers; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 4574 "Photo.c" +#line 4471 "Photo.c" } #line 518 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4578 "Photo.c" +#line 4475 "Photo.c" gboolean _tmp7_ = FALSE; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); @@ -4582,7 +4479,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _g_object_unref0 (file); #line 518 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp7_; -#line 4586 "Photo.c" +#line 4483 "Photo.c" } } #line 523 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4591,12 +4488,12 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _tmp8_ = photo_get_master_file_format (self); #line 525 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ == PHOTO_FILE_FORMAT_RAW) { -#line 4595 "Photo.c" +#line 4492 "Photo.c" gint _tmp9_; RawDeveloper* _tmp10_; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = raw_developer_as_array (&_tmp9_); -#line 4600 "Photo.c" +#line 4497 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; @@ -4608,30 +4505,30 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e d_collection_length1 = _tmp9_; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" for (d_it = 0; d_it < _tmp9_; d_it = d_it + 1) { -#line 4612 "Photo.c" +#line 4509 "Photo.c" RawDeveloper d = 0; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 4616 "Photo.c" +#line 4513 "Photo.c" { RawDeveloper _tmp11_; #line 527 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = d; #line 527 "/home/jens/Source/shotwell/src/Photo.vala" photo_delete_raw_development (self, _tmp11_); -#line 4623 "Photo.c" +#line 4520 "Photo.c" } } #line 526 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 4628 "Photo.c" +#line 4525 "Photo.c" } } #line 531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = file; #line 531 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_ != NULL) { -#line 4635 "Photo.c" +#line 4532 "Photo.c" { gboolean _tmp13_ = FALSE; GFile* _tmp14_; @@ -4644,15 +4541,15 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _tmp13_ = _tmp15_; #line 533 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4648 "Photo.c" - goto __catch259_g_error; +#line 4545 "Photo.c" + goto __catch270_g_error; } #line 533 "/home/jens/Source/shotwell/src/Photo.vala" ret = _tmp13_; -#line 4653 "Photo.c" +#line 4550 "Photo.c" } - goto __finally259; - __catch259_g_error: + goto __finally270; + __catch270_g_error: { GError* err = NULL; GFile* _tmp16_; @@ -4690,12 +4587,12 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _g_free0 (_tmp18_); #line 532 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 4694 "Photo.c" +#line 4591 "Photo.c" } - __finally259: + __finally270: #line 532 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4699 "Photo.c" +#line 4596 "Photo.c" gboolean _tmp23_ = FALSE; #line 532 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); @@ -4703,7 +4600,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _g_object_unref0 (file); #line 532 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp23_; -#line 4707 "Photo.c" +#line 4604 "Photo.c" } } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4712,7 +4609,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _tmp25_ = _tmp26_; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4716 "Photo.c" +#line 4613 "Photo.c" gboolean _tmp27_ = FALSE; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); @@ -4720,21 +4617,21 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _g_object_unref0 (file); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp27_; -#line 4724 "Photo.c" +#line 4621 "Photo.c" } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp25_) { -#line 4728 "Photo.c" +#line 4625 "Photo.c" gboolean _tmp28_; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = ret; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp28_; -#line 4734 "Photo.c" +#line 4631 "Photo.c" } else { #line 542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = FALSE; -#line 4738 "Photo.c" +#line 4635 "Photo.c" } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp24_; @@ -4742,7 +4639,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _g_object_unref0 (file); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4746 "Photo.c" +#line 4643 "Photo.c" } @@ -4767,11 +4664,11 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) result = NULL; #line 549 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4771 "Photo.c" +#line 4668 "Photo.c" } #line 551 "/home/jens/Source/shotwell/src/Photo.vala" backing_row = NULL; -#line 4775 "Photo.c" +#line 4672 "Photo.c" { BackingPhotoRow* _tmp2_ = NULL; BackingPhotoTable* _tmp3_; @@ -4798,8 +4695,8 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) if (G_UNLIKELY (_inner_error_ != NULL)) { #line 553 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 4802 "Photo.c" - goto __catch260_database_error; +#line 4699 "Photo.c" + goto __catch271_database_error; } #line 553 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing_row); @@ -4809,7 +4706,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) g_clear_error (&_inner_error_); #line 553 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4813 "Photo.c" +#line 4710 "Photo.c" } #line 553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp2_; @@ -4821,10 +4718,10 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) backing_row = _tmp8_; #line 552 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp2_); -#line 4825 "Photo.c" +#line 4722 "Photo.c" } - goto __finally260; - __catch260_database_error: + goto __finally271; + __catch271_database_error: { GError* err = NULL; gchar* _tmp9_; @@ -4849,9 +4746,9 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) _g_free0 (_tmp10_); #line 552 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 4853 "Photo.c" +#line 4750 "Photo.c" } - __finally260: + __finally271: #line 552 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 552 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4862,13 +4759,13 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) g_clear_error (&_inner_error_); #line 552 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4866 "Photo.c" +#line 4763 "Photo.c" } #line 558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = backing_row; #line 558 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ == NULL) { -#line 4872 "Photo.c" +#line 4769 "Photo.c" { BackingPhotoTable* _tmp14_; BackingPhotoTable* _tmp15_; @@ -4887,8 +4784,8 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) if (G_UNLIKELY (_inner_error_ != NULL)) { #line 560 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 4891 "Photo.c" - goto __catch261_database_error; +#line 4788 "Photo.c" + goto __catch272_database_error; } #line 560 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing_row); @@ -4898,11 +4795,11 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) g_clear_error (&_inner_error_); #line 560 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4902 "Photo.c" +#line 4799 "Photo.c" } } - goto __finally261; - __catch261_database_error: + goto __finally272; + __catch272_database_error: { GError* err = NULL; #line 559 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4911,9 +4808,9 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) _inner_error_ = NULL; #line 559 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 4915 "Photo.c" +#line 4812 "Photo.c" } - __finally261: + __finally272: #line 559 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 559 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4924,7 +4821,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) g_clear_error (&_inner_error_); #line 559 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 4928 "Photo.c" +#line 4825 "Photo.c" } #line 564 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; @@ -4932,13 +4829,13 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) _backing_photo_row_unref0 (backing_row); #line 564 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4936 "Photo.c" +#line 4833 "Photo.c" } #line 567 "/home/jens/Source/shotwell/src/Photo.vala" result = backing_row; #line 567 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4942 "Photo.c" +#line 4839 "Photo.c" } @@ -4947,7 +4844,7 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) { GError * _inner_error_ = NULL; #line 572 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 4951 "Photo.c" +#line 4848 "Photo.c" { GeeHashMap* _tmp0_; gboolean _tmp13_ = FALSE; @@ -4955,7 +4852,7 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) { _tmp0_ = self->priv->developments; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 4959 "Photo.c" +#line 4856 "Photo.c" { gboolean _tmp1_ = FALSE; GeeHashMap* _tmp2_; @@ -4969,7 +4866,7 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) { _tmp4_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp3_)); #line 574 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_) { -#line 4973 "Photo.c" +#line 4870 "Photo.c" GeeHashMap* _tmp5_; RawDeveloper _tmp6_; gpointer _tmp7_; @@ -4992,35 +4889,35 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) { _tmp1_ = _tmp10_; #line 575 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp8_); -#line 4996 "Photo.c" +#line 4893 "Photo.c" } else { #line 574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 5000 "Photo.c" +#line 4897 "Photo.c" } #line 574 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 5004 "Photo.c" +#line 4901 "Photo.c" { GeeHashMap* _tmp11_; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->priv->developments; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 5011 "Photo.c" +#line 4908 "Photo.c" } #line 574 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5015 "Photo.c" +#line 4912 "Photo.c" } - __finally262: + __finally273: { GeeHashMap* _tmp12_; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->developments; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 5024 "Photo.c" +#line 4921 "Photo.c" } #line 573 "/home/jens/Source/shotwell/src/Photo.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); @@ -5028,7 +4925,7 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 573 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp13_; -#line 5032 "Photo.c" +#line 4929 "Photo.c" } } @@ -5039,14 +4936,14 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { GError * _inner_error_ = NULL; #line 580 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 5043 "Photo.c" +#line 4940 "Photo.c" { GeeHashMap* _tmp0_; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 5050 "Photo.c" +#line 4947 "Photo.c" { GeeHashMap* _tmp1_; RawDeveloper _tmp2_; @@ -5061,32 +4958,32 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { if (_tmp3_) { #line 583 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 5065 "Photo.c" +#line 4962 "Photo.c" { GeeHashMap* _tmp4_; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->developments; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 5072 "Photo.c" +#line 4969 "Photo.c" } #line 583 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5076 "Photo.c" +#line 4973 "Photo.c" } } - __finally263: + __finally274: { GeeHashMap* _tmp5_; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->developments; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 5086 "Photo.c" +#line 4983 "Photo.c" } #line 581 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5090 "Photo.c" +#line 4987 "Photo.c" gboolean _tmp6_ = FALSE; #line 581 "/home/jens/Source/shotwell/src/Photo.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); @@ -5094,7 +4991,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 581 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp6_; -#line 5098 "Photo.c" +#line 4995 "Photo.c" } } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5103,27 +5000,27 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { switch (_tmp7_) { #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_SHOTWELL: -#line 5107 "Photo.c" +#line 5004 "Photo.c" { #line 588 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 588 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5113 "Photo.c" +#line 5010 "Photo.c" } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_CAMERA: -#line 5117 "Photo.c" +#line 5014 "Photo.c" { #line 591 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 591 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5123 "Photo.c" +#line 5020 "Photo.c" } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_EMBEDDED: -#line 5127 "Photo.c" +#line 5024 "Photo.c" { { PhotoMetadata* meta = NULL; @@ -5138,8 +5035,8 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { meta = _tmp8_; #line 595 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5142 "Photo.c" - goto __catch264_g_error; +#line 5039 "Photo.c" + goto __catch275_g_error; } #line 596 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = meta; @@ -5151,7 +5048,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _tmp11_ = num_previews; #line 598 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_ > ((guint) 0)) { -#line 5155 "Photo.c" +#line 5052 "Photo.c" PhotoPreview* prev = NULL; PhotoMetadata* _tmp12_; guint _tmp13_; @@ -5187,7 +5084,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _media_metadata_unref0 (meta); #line 603 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5191 "Photo.c" +#line 5088 "Photo.c" } #line 605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = prev; @@ -5205,7 +5102,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _tmp22_ = _tmp21_.height; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp20_ > _tmp22_) { -#line 5209 "Photo.c" +#line 5106 "Photo.c" Dimensions _tmp23_; gint _tmp24_; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5214,7 +5111,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _tmp24_ = _tmp23_.width; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp24_; -#line 5218 "Photo.c" +#line 5115 "Photo.c" } else { Dimensions _tmp25_; gint _tmp26_; @@ -5224,7 +5121,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _tmp26_ = _tmp25_.height; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp26_; -#line 5228 "Photo.c" +#line 5125 "Photo.c" } #line 608 "/home/jens/Source/shotwell/src/Photo.vala" preview_major_axis = _tmp18_; @@ -5240,7 +5137,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _media_metadata_unref0 (meta); #line 610 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5244 "Photo.c" +#line 5141 "Photo.c" } #line 613 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -5250,7 +5147,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _media_metadata_unref0 (meta); #line 613 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5254 "Photo.c" +#line 5151 "Photo.c" } #line 617 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; @@ -5258,10 +5155,10 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _media_metadata_unref0 (meta); #line 617 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5262 "Photo.c" +#line 5159 "Photo.c" } - goto __finally264; - __catch264_g_error: + goto __finally275; + __catch275_g_error: { GError* e = NULL; GError* _tmp28_; @@ -5278,12 +5175,12 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp29_); #line 594 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5282 "Photo.c" +#line 5179 "Photo.c" } - __finally264: + __finally275: #line 594 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5287 "Photo.c" +#line 5184 "Photo.c" gboolean _tmp30_ = FALSE; #line 594 "/home/jens/Source/shotwell/src/Photo.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); @@ -5291,30 +5188,29 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 594 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp30_; -#line 5295 "Photo.c" +#line 5192 "Photo.c" } #line 621 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 621 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5301 "Photo.c" +#line 5198 "Photo.c" } default: { #line 624 "/home/jens/Source/shotwell/src/Photo.vala" g_assert_not_reached (); -#line 5307 "Photo.c" +#line 5204 "Photo.c" } } } -void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, GError** error) { +void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, gboolean notify, GError** error) { PhotoRow* _tmp0_; RawDeveloper _tmp1_; BackingPhotoRow* _tmp2_; - Alteration* _tmp8_; - Alteration* _tmp9_; + gboolean _tmp8_; GError * _inner_error_ = NULL; #line 631 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -5334,7 +5230,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi g_propagate_error (error, _inner_error_); #line 632 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5338 "Photo.c" +#line 5234 "Photo.c" } { GeeHashMap* _tmp3_; @@ -5342,7 +5238,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi _tmp3_ = self->priv->developments; #line 633 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 5346 "Photo.c" +#line 5242 "Photo.c" { GeeHashMap* _tmp4_; RawDeveloper _tmp5_; @@ -5355,16 +5251,16 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi _tmp6_ = bpr; #line 634 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp5_), _tmp6_); -#line 5359 "Photo.c" +#line 5255 "Photo.c" } - __finally265: + __finally276: { GeeHashMap* _tmp7_; #line 633 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->developments; #line 633 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 5368 "Photo.c" +#line 5264 "Photo.c" } #line 633 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5372,18 +5268,26 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi g_propagate_error (error, _inner_error_); #line 633 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5376 "Photo.c" +#line 5272 "Photo.c" } } -#line 636 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = alteration_new ("image", "developer"); -#line 636 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; -#line 636 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp9_); -#line 636 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp9_); -#line 5387 "Photo.c" +#line 637 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp8_ = notify; +#line 637 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp8_) { +#line 5279 "Photo.c" + Alteration* _tmp9_; + Alteration* _tmp10_; +#line 638 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp9_ = alteration_new ("image", "developer"); +#line 638 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp10_ = _tmp9_; +#line 638 "/home/jens/Source/shotwell/src/Photo.vala" + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp10_); +#line 638 "/home/jens/Source/shotwell/src/Photo.vala" + _alteration_unref0 (_tmp10_); +#line 5290 "Photo.c" + } } @@ -5430,242 +5334,242 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin BackingPhotoRow* _tmp39_; BackingPhotoID _tmp40_; GError * _inner_error_ = NULL; -#line 639 "/home/jens/Source/shotwell/src/Photo.vala" +#line 641 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO_ROW (row)); -#line 639 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_if_fail (IS_BACKING_PHOTO_ROW (bpr)); #line 641 "/home/jens/Source/shotwell/src/Photo.vala" + g_return_if_fail (IS_BACKING_PHOTO_ROW (bpr)); +#line 643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = bpr; -#line 641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_->filepath; -#line 641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = g_file_new_for_path (_tmp1_); -#line 641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 643 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp2_; -#line 642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 644 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; -#line 642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 644 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = g_file_query_info (_tmp3_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); -#line 642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 644 "/home/jens/Source/shotwell/src/Photo.vala" info = _tmp4_; -#line 642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 644 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 644 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 644 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 644 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5460 "Photo.c" +#line 5364 "Photo.c" } -#line 644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 646 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = info; -#line 644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 646 "/home/jens/Source/shotwell/src/Photo.vala" g_file_info_get_modification_time (_tmp5_, &_tmp6_); -#line 644 "/home/jens/Source/shotwell/src/Photo.vala" - timestamp = _tmp6_; #line 646 "/home/jens/Source/shotwell/src/Photo.vala" + timestamp = _tmp6_; +#line 648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = file; -#line 646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_file_interrogator_new (_tmp7_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL); -#line 646 "/home/jens/Source/shotwell/src/Photo.vala" - interrogator = _tmp8_; #line 648 "/home/jens/Source/shotwell/src/Photo.vala" + interrogator = _tmp8_; +#line 650 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = interrogator; -#line 648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 650 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (_tmp9_, &_inner_error_); -#line 648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 650 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 650 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 650 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 650 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 650 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 650 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5490 "Photo.c" +#line 5394 "Photo.c" } -#line 650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 652 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = interrogator; -#line 650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 652 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_file_interrogator_get_detected_photo_information (_tmp10_); -#line 650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 652 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp11_; -#line 651 "/home/jens/Source/shotwell/src/Photo.vala" +#line 653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = detected; -#line 651 "/home/jens/Source/shotwell/src/Photo.vala" +#line 653 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ == NULL) { -#line 651 "/home/jens/Source/shotwell/src/Photo.vala" +#line 653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = TRUE; -#line 5504 "Photo.c" +#line 5408 "Photo.c" } else { PhotoFileInterrogator* _tmp14_; gboolean _tmp15_; -#line 651 "/home/jens/Source/shotwell/src/Photo.vala" +#line 653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = interrogator; -#line 651 "/home/jens/Source/shotwell/src/Photo.vala" +#line 653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_file_interrogator_get_is_photo_corrupted (_tmp14_); -#line 651 "/home/jens/Source/shotwell/src/Photo.vala" +#line 653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp15_; -#line 5514 "Photo.c" +#line 5418 "Photo.c" } -#line 651 "/home/jens/Source/shotwell/src/Photo.vala" +#line 653 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 654 "/home/jens/Source/shotwell/src/Photo.vala" +#line 656 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 654 "/home/jens/Source/shotwell/src/Photo.vala" +#line 656 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 654 "/home/jens/Source/shotwell/src/Photo.vala" +#line 656 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 654 "/home/jens/Source/shotwell/src/Photo.vala" +#line 656 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 654 "/home/jens/Source/shotwell/src/Photo.vala" +#line 656 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5528 "Photo.c" +#line 5432 "Photo.c" } -#line 657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = bpr; -#line 657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = detected; -#line 657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_->image_dim; -#line 657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_->dim = _tmp18_; -#line 658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = bpr; -#line 658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = info; -#line 658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = g_file_info_get_size (_tmp20_); -#line 658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_->filesize = _tmp21_; -#line 659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = bpr; -#line 659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = timestamp; -#line 659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_.tv_sec; -#line 659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_->timestamp = (time_t) _tmp24_; -#line 660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = detected; -#line 660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_->metadata; -#line 660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 662 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp27_ != NULL) { -#line 5560 "Photo.c" +#line 5464 "Photo.c" DetectedPhotoInformation* _tmp28_; PhotoMetadata* _tmp29_; Orientation _tmp30_; -#line 660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = detected; -#line 660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp28_->metadata; -#line 660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = photo_metadata_get_orientation (_tmp29_); -#line 660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp30_; -#line 5572 "Photo.c" +#line 5476 "Photo.c" } else { -#line 661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 663 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = ORIENTATION_TOP_LEFT; -#line 5576 "Photo.c" +#line 5480 "Photo.c" } -#line 660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = bpr; -#line 660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_->original_orientation = _tmp25_; -#line 664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 666 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = backing_photo_table_get_instance (); -#line 664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 666 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_; -#line 664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 666 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = bpr; -#line 664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 666 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_add (_tmp33_, _tmp34_, &_inner_error_); -#line 664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 666 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp33_); -#line 664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 666 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 666 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 666 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 666 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 666 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 666 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 666 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5606 "Photo.c" +#line 5510 "Photo.c" } -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_table_get_instance (); -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = _tmp35_; -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = row; -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = d; -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = bpr; -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = _tmp39_->id; -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_update_raw_development (_tmp36_, _tmp37_, _tmp38_, &_tmp40_, &_inner_error_); -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp36_); -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 667 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5638 "Photo.c" +#line 5542 "Photo.c" } -#line 639 "/home/jens/Source/shotwell/src/Photo.vala" +#line 641 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 639 "/home/jens/Source/shotwell/src/Photo.vala" +#line 641 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 639 "/home/jens/Source/shotwell/src/Photo.vala" +#line 641 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 639 "/home/jens/Source/shotwell/src/Photo.vala" +#line 641 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 5648 "Photo.c" +#line 5552 "Photo.c" } -static void photo_develop_photo (Photo* self, RawDeveloper d) { +static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { gboolean wrote_img_to_disk = FALSE; BackingPhotoRow* bps = NULL; RawDeveloper _tmp0_; GError * _inner_error_ = NULL; -#line 670 "/home/jens/Source/shotwell/src/Photo.vala" +#line 672 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 671 "/home/jens/Source/shotwell/src/Photo.vala" +#line 673 "/home/jens/Source/shotwell/src/Photo.vala" wrote_img_to_disk = FALSE; -#line 672 "/home/jens/Source/shotwell/src/Photo.vala" - bps = NULL; #line 674 "/home/jens/Source/shotwell/src/Photo.vala" + bps = NULL; +#line 676 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = d; -#line 674 "/home/jens/Source/shotwell/src/Photo.vala" +#line 676 "/home/jens/Source/shotwell/src/Photo.vala" switch (_tmp0_) { -#line 674 "/home/jens/Source/shotwell/src/Photo.vala" +#line 676 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_SHOTWELL: -#line 5669 "Photo.c" +#line 5573 "Photo.c" { { BackingPhotoRow* _tmp1_ = NULL; @@ -5678,1369 +5582,1590 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { GdkPixbuf* pix = NULL; GdkPixbuf* _tmp14_; PhotoFileWriter* writer = NULL; - BackingPhotoRow* _tmp20_; - const gchar* _tmp21_; - PhotoFileWriter* _tmp22_; + BackingPhotoRow* _tmp21_; + const gchar* _tmp22_; PhotoFileWriter* _tmp23_; - GdkPixbuf* _tmp24_; + PhotoFileWriter* _tmp24_; + GdkPixbuf* _tmp25_; PhotoMetadata* meta = NULL; - PhotoMetadata* _tmp25_; + PhotoMetadata* _tmp26_; PhotoFileMetadataWriter* mwriter = NULL; - BackingPhotoRow* _tmp26_; - const gchar* _tmp27_; - PhotoFileMetadataWriter* _tmp28_; + BackingPhotoRow* _tmp27_; + const gchar* _tmp28_; PhotoFileMetadataWriter* _tmp29_; - PhotoMetadata* _tmp30_; -#line 678 "/home/jens/Source/shotwell/src/Photo.vala" + PhotoFileMetadataWriter* _tmp30_; + PhotoMetadata* _tmp31_; +#line 680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = d; -#line 678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->master; -#line 678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->filepath; -#line 678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = raw_developer_create_backing_row_for_development (_tmp2_, _tmp5_, NULL, &_inner_error_); -#line 678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp6_; -#line 678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 680 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5709 "Photo.c" - goto __catch266_g_error; +#line 5613 "Photo.c" + goto __catch277_g_error; } -#line 678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp1_; -#line 678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 680 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 680 "/home/jens/Source/shotwell/src/Photo.vala" bps = _tmp7_; -#line 679 "/home/jens/Source/shotwell/src/Photo.vala" +#line 681 "/home/jens/Source/shotwell/src/Photo.vala" pix = NULL; -#line 5722 "Photo.c" +#line 5626 "Photo.c" { PhotoBackingReaders* _tmp8_; -#line 680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 682 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->priv->readers; -#line 680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 682 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 5729 "Photo.c" +#line 5633 "Photo.c" { GdkPixbuf* _tmp9_ = NULL; Scaling _tmp10_ = {0}; GdkPixbuf* _tmp11_; GdkPixbuf* _tmp12_; -#line 685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 687 "/home/jens/Source/shotwell/src/Photo.vala" scaling_for_original (&_tmp10_); -#line 685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 687 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_get_master_pixbuf (self, &_tmp10_, FALSE, &_inner_error_); -#line 685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 687 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp11_; -#line 685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 687 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5743 "Photo.c" - goto __finally267; +#line 5647 "Photo.c" + goto __finally278; } -#line 685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 687 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp9_; -#line 685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 687 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = NULL; -#line 685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 687 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); -#line 685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 687 "/home/jens/Source/shotwell/src/Photo.vala" pix = _tmp12_; -#line 680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 682 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp9_); -#line 5756 "Photo.c" +#line 5660 "Photo.c" } - __finally267: + __finally278: { PhotoBackingReaders* _tmp13_; -#line 680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 682 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->readers; -#line 680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 682 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 5765 "Photo.c" +#line 5669 "Photo.c" } -#line 680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 682 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 682 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); -#line 680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 682 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5773 "Photo.c" - goto __catch266_g_error; +#line 5677 "Photo.c" + goto __catch277_g_error; } } -#line 688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 690 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = pix; -#line 688 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_ == NULL) { -#line 689 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:689: Could not get preview pixbuf"); #line 690 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp14_ == NULL) { +#line 691 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:691: Could not get preview pixbuf"); +#line 692 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); -#line 690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 692 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5787 "Photo.c" +#line 5691 "Photo.c" { gboolean _tmp15_; -#line 714 "/home/jens/Source/shotwell/src/Photo.vala" +#line 716 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = wrote_img_to_disk; -#line 714 "/home/jens/Source/shotwell/src/Photo.vala" +#line 716 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 5794 "Photo.c" +#line 5698 "Photo.c" { RawDeveloper _tmp16_; BackingPhotoRow* _tmp17_; -#line 717 "/home/jens/Source/shotwell/src/Photo.vala" + gboolean _tmp18_; +#line 719 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = d; -#line 717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 719 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = bps; -#line 717 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp16_, _tmp17_, &_inner_error_); -#line 717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 719 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp18_ = notify; +#line 719 "/home/jens/Source/shotwell/src/Photo.vala" + photo_add_backing_photo_for_development (self, _tmp16_, _tmp17_, _tmp18_, &_inner_error_); +#line 719 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5806 "Photo.c" - goto __catch268_g_error; +#line 5713 "Photo.c" + goto __catch279_g_error; } -#line 719 "/home/jens/Source/shotwell/src/Photo.vala" +#line 721 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 5811 "Photo.c" +#line 5718 "Photo.c" } - goto __finally268; - __catch268_g_error: + goto __finally279; + __catch279_g_error: { GError* e = NULL; - GError* _tmp18_; - const gchar* _tmp19_; -#line 715 "/home/jens/Source/shotwell/src/Photo.vala" + GError* _tmp19_; + const gchar* _tmp20_; +#line 717 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 717 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 721 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = e; -#line 721 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->message; -#line 721 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp19_); -#line 715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 723 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp19_ = e; +#line 723 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp20_ = _tmp19_->message; +#line 723 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:723: Error adding backing photo as development. Message: %s", _tmp20_); +#line 717 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5831 "Photo.c" +#line 5738 "Photo.c" } - __finally268: -#line 715 "/home/jens/Source/shotwell/src/Photo.vala" + __finally279: +#line 717 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5836 "Photo.c" - goto __catch266_g_error; +#line 5743 "Photo.c" + goto __catch277_g_error; } } } -#line 690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 692 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 692 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5845 "Photo.c" +#line 5752 "Photo.c" } -#line 694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = bps; -#line 694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_->filepath; -#line 694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp21_, &_inner_error_); -#line 694 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp22_; -#line 694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 696 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp21_ = bps; +#line 696 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp22_ = _tmp21_->filepath; +#line 696 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp23_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp22_, &_inner_error_); +#line 696 "/home/jens/Source/shotwell/src/Photo.vala" + writer = _tmp23_; +#line 696 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 696 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); -#line 694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 696 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5861 "Photo.c" - goto __catch266_g_error; +#line 5768 "Photo.c" + goto __catch277_g_error; } -#line 695 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = writer; -#line 695 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = pix; -#line 695 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_writer_write (_tmp23_, _tmp24_, JPEG_QUALITY_HIGH, &_inner_error_); -#line 695 "/home/jens/Source/shotwell/src/Photo.vala" +#line 697 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp24_ = writer; +#line 697 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp25_ = pix; +#line 697 "/home/jens/Source/shotwell/src/Photo.vala" + photo_file_writer_write (_tmp24_, _tmp25_, JPEG_QUALITY_HIGH, &_inner_error_); +#line 697 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 695 "/home/jens/Source/shotwell/src/Photo.vala" +#line 697 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 695 "/home/jens/Source/shotwell/src/Photo.vala" +#line 697 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); -#line 695 "/home/jens/Source/shotwell/src/Photo.vala" +#line 697 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5878 "Photo.c" - goto __catch266_g_error; +#line 5785 "Photo.c" + goto __catch277_g_error; } -#line 703 "/home/jens/Source/shotwell/src/Photo.vala" +#line 705 "/home/jens/Source/shotwell/src/Photo.vala" wrote_img_to_disk = TRUE; -#line 708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = photo_get_master_metadata (self, &_inner_error_); -#line 708 "/home/jens/Source/shotwell/src/Photo.vala" - meta = _tmp25_; -#line 708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 710 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp26_ = photo_get_master_metadata (self, &_inner_error_); +#line 710 "/home/jens/Source/shotwell/src/Photo.vala" + meta = _tmp26_; +#line 710 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 710 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 710 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); -#line 708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 710 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5895 "Photo.c" - goto __catch266_g_error; +#line 5802 "Photo.c" + goto __catch277_g_error; } -#line 709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = bps; -#line 709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_->filepath; -#line 709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp27_, &_inner_error_); -#line 709 "/home/jens/Source/shotwell/src/Photo.vala" - mwriter = _tmp28_; -#line 709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 711 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp27_ = bps; +#line 711 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp28_ = _tmp27_->filepath; +#line 711 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp29_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp28_, &_inner_error_); +#line 711 "/home/jens/Source/shotwell/src/Photo.vala" + mwriter = _tmp29_; +#line 711 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 711 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 711 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 711 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); -#line 709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 711 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5916 "Photo.c" - goto __catch266_g_error; +#line 5823 "Photo.c" + goto __catch277_g_error; } -#line 710 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = mwriter; -#line 710 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = meta; -#line 710 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp29_, _tmp30_, &_inner_error_); -#line 710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 712 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp30_ = mwriter; +#line 712 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp31_ = meta; +#line 712 "/home/jens/Source/shotwell/src/Photo.vala" + photo_file_metadata_writer_write_metadata (_tmp30_, _tmp31_, &_inner_error_); +#line 712 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 712 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (mwriter); -#line 710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 712 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 712 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 712 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); -#line 710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 712 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5937 "Photo.c" - goto __catch266_g_error; +#line 5844 "Photo.c" + goto __catch277_g_error; } -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 678 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (mwriter); -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 678 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 678 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 678 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 678 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5950 "Photo.c" +#line 5857 "Photo.c" } - goto __finally266; - __catch266_g_error: + goto __finally277; + __catch277_g_error: { GError* err = NULL; - GError* _tmp31_; - const gchar* _tmp32_; -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" + GError* _tmp32_; + const gchar* _tmp33_; +#line 678 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 678 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 712 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = err; -#line 712 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_->message; -#line 712 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:712: Error developing photo: %s", _tmp32_); -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 714 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp32_ = err; +#line 714 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp33_ = _tmp32_->message; +#line 714 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:714: Error developing photo: %s", _tmp33_); +#line 678 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 5970 "Photo.c" +#line 5877 "Photo.c" } - __finally266: + __finally277: { - gboolean _tmp33_; -#line 714 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = wrote_img_to_disk; -#line 714 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp33_) { -#line 5979 "Photo.c" + gboolean _tmp34_; +#line 716 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp34_ = wrote_img_to_disk; +#line 716 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp34_) { +#line 5886 "Photo.c" { - RawDeveloper _tmp34_; - BackingPhotoRow* _tmp35_; -#line 717 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = d; -#line 717 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = bps; -#line 717 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp34_, _tmp35_, &_inner_error_); -#line 717 "/home/jens/Source/shotwell/src/Photo.vala" + RawDeveloper _tmp35_; + BackingPhotoRow* _tmp36_; + gboolean _tmp37_; +#line 719 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp35_ = d; +#line 719 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp36_ = bps; +#line 719 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp37_ = notify; +#line 719 "/home/jens/Source/shotwell/src/Photo.vala" + photo_add_backing_photo_for_development (self, _tmp35_, _tmp36_, _tmp37_, &_inner_error_); +#line 719 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5991 "Photo.c" - goto __catch269_g_error; +#line 5901 "Photo.c" + goto __catch280_g_error; } -#line 719 "/home/jens/Source/shotwell/src/Photo.vala" +#line 721 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 5996 "Photo.c" +#line 5906 "Photo.c" } - goto __finally269; - __catch269_g_error: + goto __finally280; + __catch280_g_error: { GError* e = NULL; - GError* _tmp36_; - const gchar* _tmp37_; -#line 715 "/home/jens/Source/shotwell/src/Photo.vala" + GError* _tmp38_; + const gchar* _tmp39_; +#line 717 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 717 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 721 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = e; -#line 721 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_->message; -#line 721 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp37_); -#line 715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 723 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp38_ = e; +#line 723 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp39_ = _tmp38_->message; +#line 723 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:723: Error adding backing photo as development. Message: %s", _tmp39_); +#line 717 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6016 "Photo.c" +#line 5926 "Photo.c" } - __finally269: -#line 715 "/home/jens/Source/shotwell/src/Photo.vala" + __finally280: +#line 717 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 717 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 717 "/home/jens/Source/shotwell/src/Photo.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 715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 717 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 717 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6029 "Photo.c" +#line 5939 "Photo.c" } } } -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 678 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 678 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 678 "/home/jens/Source/shotwell/src/Photo.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 676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 678 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 678 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6043 "Photo.c" +#line 5953 "Photo.c" } -#line 727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 729 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 6047 "Photo.c" +#line 5957 "Photo.c" } -#line 674 "/home/jens/Source/shotwell/src/Photo.vala" +#line 676 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_CAMERA: -#line 6051 "Photo.c" +#line 5961 "Photo.c" { -#line 731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 733 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 6055 "Photo.c" +#line 5965 "Photo.c" } -#line 674 "/home/jens/Source/shotwell/src/Photo.vala" +#line 676 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_EMBEDDED: -#line 6059 "Photo.c" +#line 5969 "Photo.c" { { PhotoMetadata* meta = NULL; - PhotoMetadata* _tmp38_; + PhotoMetadata* _tmp40_; guint c = 0U; - PhotoMetadata* _tmp39_; - guint _tmp40_; - guint _tmp41_; + PhotoMetadata* _tmp41_; + guint _tmp42_; + guint _tmp43_; PhotoPreview* prev = NULL; - PhotoMetadata* _tmp47_; - guint _tmp48_; - PhotoPreview* _tmp49_; - PhotoPreview* _tmp50_; - GdkPixbuf* pix = NULL; - PhotoPreview* _tmp56_; - GdkPixbuf* _tmp57_; - GdkPixbuf* _tmp58_; - BackingPhotoRow* _tmp64_ = NULL; - RawDeveloper _tmp65_; - PhotoRow* _tmp66_; - BackingPhotoRow* _tmp67_; - const gchar* _tmp68_; - BackingPhotoRow* _tmp69_; - BackingPhotoRow* _tmp70_; - PhotoFileWriter* writer = NULL; - BackingPhotoRow* _tmp71_; - const gchar* _tmp72_; - PhotoFileWriter* _tmp73_; - PhotoFileWriter* _tmp74_; - GdkPixbuf* _tmp75_; + PhotoMetadata* _tmp50_; + guint _tmp51_; + PhotoPreview* _tmp52_; + PhotoPreview* _tmp53_; + GBytes* pix = NULL; + PhotoPreview* _tmp60_; + GBytes* _tmp61_; + GBytes* _tmp62_; + BackingPhotoRow* _tmp69_ = NULL; + RawDeveloper _tmp70_; + PhotoRow* _tmp71_; + BackingPhotoRow* _tmp72_; + const gchar* _tmp73_; + BackingPhotoRow* _tmp74_; + BackingPhotoRow* _tmp75_; + gboolean _tmp76_ = FALSE; + GBytes* _tmp77_; + gboolean _tmp78_; PhotoFileMetadataWriter* mwriter = NULL; - BackingPhotoRow* _tmp76_; - const gchar* _tmp77_; - PhotoFileMetadataWriter* _tmp78_; - PhotoFileMetadataWriter* _tmp79_; - PhotoMetadata* _tmp80_; -#line 736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = photo_get_master_metadata (self, &_inner_error_); -#line 736 "/home/jens/Source/shotwell/src/Photo.vala" - meta = _tmp38_; -#line 736 "/home/jens/Source/shotwell/src/Photo.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6102 "Photo.c" - goto __catch270_g_error; - } -#line 737 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = meta; -#line 737 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = photo_metadata_get_preview_count (_tmp39_); -#line 737 "/home/jens/Source/shotwell/src/Photo.vala" - c = _tmp40_; + BackingPhotoRow* _tmp100_; + const gchar* _tmp101_; + PhotoFileMetadataWriter* _tmp102_; + PhotoFileMetadataWriter* _tmp103_; + PhotoMetadata* _tmp104_; +#line 738 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp40_ = photo_get_master_metadata (self, &_inner_error_); #line 738 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = c; + meta = _tmp40_; #line 738 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp41_ <= ((guint) 0)) { + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 6009 "Photo.c" + goto __catch281_g_error; + } +#line 739 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp41_ = meta; +#line 739 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp42_ = photo_metadata_get_preview_count (_tmp41_); #line 739 "/home/jens/Source/shotwell/src/Photo.vala" + c = _tmp42_; +#line 740 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp43_ = c; +#line 740 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp43_ <= ((guint) 0)) { +#line 741 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6117 "Photo.c" +#line 6024 "Photo.c" { - gboolean _tmp42_; -#line 768 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = wrote_img_to_disk; -#line 768 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp42_) { -#line 6124 "Photo.c" + gboolean _tmp44_; +#line 786 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp44_ = wrote_img_to_disk; +#line 786 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp44_) { +#line 6031 "Photo.c" { - RawDeveloper _tmp43_; - BackingPhotoRow* _tmp44_; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = d; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = bps; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp43_, _tmp44_, &_inner_error_); -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + RawDeveloper _tmp45_; + BackingPhotoRow* _tmp46_; + gboolean _tmp47_; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp45_ = d; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp46_ = bps; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp47_ = notify; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + photo_add_backing_photo_for_development (self, _tmp45_, _tmp46_, _tmp47_, &_inner_error_); +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6136 "Photo.c" - goto __catch271_g_error; +#line 6046 "Photo.c" + goto __catch282_g_error; } -#line 773 "/home/jens/Source/shotwell/src/Photo.vala" +#line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6141 "Photo.c" +#line 6051 "Photo.c" } - goto __finally271; - __catch271_g_error: + goto __finally282; + __catch282_g_error: { GError* e = NULL; - GError* _tmp45_; - const gchar* _tmp46_; -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" + GError* _tmp48_; + const gchar* _tmp49_; +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = e; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = _tmp45_->message; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp46_); -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp48_ = e; +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp49_ = _tmp48_->message; +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp49_); +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6161 "Photo.c" +#line 6071 "Photo.c" } - __finally271: -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" + __finally282: +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6166 "Photo.c" - goto __catch270_g_error; +#line 6076 "Photo.c" + goto __catch281_g_error; } } } -#line 739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 741 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 741 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6175 "Photo.c" +#line 6085 "Photo.c" } -#line 740 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = meta; -#line 740 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = c; -#line 740 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = photo_metadata_get_preview (_tmp47_, _tmp48_ - 1); -#line 740 "/home/jens/Source/shotwell/src/Photo.vala" - prev = _tmp49_; -#line 741 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = prev; -#line 741 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp50_ == NULL) { #line 742 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:742: Could not get preview from metadata"); + _tmp50_ = meta; +#line 742 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp51_ = c; +#line 742 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp52_ = photo_metadata_get_preview (_tmp50_, _tmp51_ - 1); +#line 742 "/home/jens/Source/shotwell/src/Photo.vala" + prev = _tmp52_; #line 743 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_preview_unref0 (prev); + _tmp53_ = prev; #line 743 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp53_ == NULL) { +#line 744 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:744: Could not get preview from metadata"); +#line 745 "/home/jens/Source/shotwell/src/Photo.vala" + _photo_preview_unref0 (prev); +#line 745 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6195 "Photo.c" +#line 6105 "Photo.c" { - gboolean _tmp51_; -#line 768 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = wrote_img_to_disk; -#line 768 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp51_) { -#line 6202 "Photo.c" + gboolean _tmp54_; +#line 786 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp54_ = wrote_img_to_disk; +#line 786 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp54_) { +#line 6112 "Photo.c" { - RawDeveloper _tmp52_; - BackingPhotoRow* _tmp53_; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = d; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = bps; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp52_, _tmp53_, &_inner_error_); -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + RawDeveloper _tmp55_; + BackingPhotoRow* _tmp56_; + gboolean _tmp57_; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp55_ = d; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp56_ = bps; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp57_ = notify; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + photo_add_backing_photo_for_development (self, _tmp55_, _tmp56_, _tmp57_, &_inner_error_); +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6214 "Photo.c" - goto __catch272_g_error; +#line 6127 "Photo.c" + goto __catch283_g_error; } -#line 773 "/home/jens/Source/shotwell/src/Photo.vala" +#line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6219 "Photo.c" +#line 6132 "Photo.c" } - goto __finally272; - __catch272_g_error: + goto __finally283; + __catch283_g_error: { GError* e = NULL; - GError* _tmp54_; - const gchar* _tmp55_; -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" + GError* _tmp58_; + const gchar* _tmp59_; +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = e; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = _tmp54_->message; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp55_); -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp58_ = e; +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp59_ = _tmp58_->message; +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp59_); +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6239 "Photo.c" +#line 6152 "Photo.c" } - __finally272: -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" + __finally283: +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6244 "Photo.c" - goto __catch270_g_error; +#line 6157 "Photo.c" + goto __catch281_g_error; } } } -#line 743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 745 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 745 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6253 "Photo.c" +#line 6166 "Photo.c" } -#line 746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = prev; -#line 746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = photo_preview_get_pixbuf (_tmp56_, &_inner_error_); -#line 746 "/home/jens/Source/shotwell/src/Photo.vala" - pix = _tmp57_; -#line 746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 748 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp60_ = prev; +#line 748 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp61_ = photo_preview_flatten (_tmp60_, &_inner_error_); +#line 748 "/home/jens/Source/shotwell/src/Photo.vala" + pix = _tmp61_; +#line 748 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 748 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); -#line 746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 748 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6267 "Photo.c" - goto __catch270_g_error; +#line 6180 "Photo.c" + goto __catch281_g_error; } -#line 747 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = pix; -#line 747 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp58_ == NULL) { -#line 748 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:748: Could not get preview pixbuf"); #line 749 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (pix); + _tmp62_ = pix; #line 749 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp62_ == NULL) { +#line 750 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:750: Could not get preview pixbuf"); +#line 751 "/home/jens/Source/shotwell/src/Photo.vala" + _g_bytes_unref0 (pix); +#line 751 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); -#line 749 "/home/jens/Source/shotwell/src/Photo.vala" +#line 751 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6282 "Photo.c" +#line 6195 "Photo.c" { - gboolean _tmp59_; -#line 768 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = wrote_img_to_disk; -#line 768 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp59_) { -#line 6289 "Photo.c" + gboolean _tmp63_; +#line 786 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp63_ = wrote_img_to_disk; +#line 786 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp63_) { +#line 6202 "Photo.c" { - RawDeveloper _tmp60_; - BackingPhotoRow* _tmp61_; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = d; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = bps; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp60_, _tmp61_, &_inner_error_); -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + RawDeveloper _tmp64_; + BackingPhotoRow* _tmp65_; + gboolean _tmp66_; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp64_ = d; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp65_ = bps; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp66_ = notify; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + photo_add_backing_photo_for_development (self, _tmp64_, _tmp65_, _tmp66_, &_inner_error_); +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6301 "Photo.c" - goto __catch273_g_error; +#line 6217 "Photo.c" + goto __catch284_g_error; } -#line 773 "/home/jens/Source/shotwell/src/Photo.vala" +#line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6306 "Photo.c" +#line 6222 "Photo.c" } - goto __finally273; - __catch273_g_error: + goto __finally284; + __catch284_g_error: { GError* e = NULL; - GError* _tmp62_; - const gchar* _tmp63_; -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" + GError* _tmp67_; + const gchar* _tmp68_; +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = e; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = _tmp62_->message; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp63_); -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp67_ = e; +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp68_ = _tmp67_->message; +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp68_); +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6326 "Photo.c" +#line 6242 "Photo.c" } - __finally273: -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" + __finally284: +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6331 "Photo.c" - goto __catch270_g_error; +#line 6247 "Photo.c" + goto __catch281_g_error; } } } -#line 749 "/home/jens/Source/shotwell/src/Photo.vala" +#line 751 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 749 "/home/jens/Source/shotwell/src/Photo.vala" +#line 751 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6340 "Photo.c" - } -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = d; -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = self->row; -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = _tmp66_->master; -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = _tmp67_->filepath; -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = raw_developer_create_backing_row_for_development (_tmp65_, _tmp68_, NULL, &_inner_error_); -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = _tmp69_; -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (pix); -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_preview_unref0 (prev); -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - _media_metadata_unref0 (meta); -#line 6362 "Photo.c" - goto __catch270_g_error; - } -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = _tmp64_; -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = NULL; -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (bps); -#line 753 "/home/jens/Source/shotwell/src/Photo.vala" - bps = _tmp70_; -#line 754 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = bps; -#line 754 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_->filepath; -#line 754 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp72_, &_inner_error_); -#line 754 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp73_; -#line 754 "/home/jens/Source/shotwell/src/Photo.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 754 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp64_); -#line 754 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (pix); -#line 754 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_preview_unref0 (prev); -#line 754 "/home/jens/Source/shotwell/src/Photo.vala" - _media_metadata_unref0 (meta); -#line 6391 "Photo.c" - goto __catch270_g_error; +#line 6256 "Photo.c" } #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = writer; + _tmp70_ = d; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = pix; + _tmp71_ = self->row; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_writer_write (_tmp74_, _tmp75_, JPEG_QUALITY_HIGH, &_inner_error_); + _tmp72_ = _tmp71_->master; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { + _tmp73_ = _tmp72_->filepath; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (writer); + _tmp74_ = raw_developer_create_backing_row_for_development (_tmp70_, _tmp73_, NULL, &_inner_error_); #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp64_); + _tmp69_ = _tmp74_; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (pix); + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 755 "/home/jens/Source/shotwell/src/Photo.vala" + _g_bytes_unref0 (pix); #line 755 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 755 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6412 "Photo.c" - goto __catch270_g_error; +#line 6278 "Photo.c" + goto __catch281_g_error; } +#line 755 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp75_ = _tmp69_; +#line 755 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp69_ = NULL; +#line 755 "/home/jens/Source/shotwell/src/Photo.vala" + _backing_photo_row_unref0 (bps); +#line 755 "/home/jens/Source/shotwell/src/Photo.vala" + bps = _tmp75_; +#line 759 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp77_ = pix; +#line 759 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp78_ = jpeg_is_jpeg_bytes (_tmp77_, &_inner_error_); +#line 759 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp76_ = _tmp78_; #line 759 "/home/jens/Source/shotwell/src/Photo.vala" - wrote_img_to_disk = TRUE; -#line 762 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = bps; -#line 762 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = _tmp76_->filepath; -#line 762 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp77_, &_inner_error_); -#line 762 "/home/jens/Source/shotwell/src/Photo.vala" - mwriter = _tmp78_; -#line 762 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 759 "/home/jens/Source/shotwell/src/Photo.vala" + _backing_photo_row_unref0 (_tmp69_); +#line 759 "/home/jens/Source/shotwell/src/Photo.vala" + _g_bytes_unref0 (pix); +#line 759 "/home/jens/Source/shotwell/src/Photo.vala" + _photo_preview_unref0 (prev); +#line 759 "/home/jens/Source/shotwell/src/Photo.vala" + _media_metadata_unref0 (meta); +#line 6305 "Photo.c" + goto __catch281_g_error; + } +#line 759 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp76_) { +#line 6310 "Photo.c" + GFile* outfile = NULL; + BackingPhotoRow* _tmp79_; + const gchar* _tmp80_; + GFile* _tmp81_; + GFile* _tmp82_; + GBytes* _tmp83_; + gsize _tmp84_; + guint8* _tmp85_; +#line 760 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp79_ = bps; +#line 760 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp80_ = _tmp79_->filepath; +#line 760 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp81_ = g_file_new_for_path (_tmp80_); +#line 760 "/home/jens/Source/shotwell/src/Photo.vala" + outfile = _tmp81_; +#line 761 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp82_ = outfile; +#line 761 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp83_ = pix; +#line 761 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp85_ = g_bytes_get_data (_tmp83_, &_tmp84_); +#line 761 "/home/jens/Source/shotwell/src/Photo.vala" + g_file_replace_contents (_tmp82_, _tmp85_, (gsize) _tmp84_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, &_inner_error_); +#line 761 "/home/jens/Source/shotwell/src/Photo.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 761 "/home/jens/Source/shotwell/src/Photo.vala" + _g_object_unref0 (outfile); +#line 761 "/home/jens/Source/shotwell/src/Photo.vala" + _backing_photo_row_unref0 (_tmp69_); +#line 761 "/home/jens/Source/shotwell/src/Photo.vala" + _g_bytes_unref0 (pix); +#line 761 "/home/jens/Source/shotwell/src/Photo.vala" + _photo_preview_unref0 (prev); +#line 761 "/home/jens/Source/shotwell/src/Photo.vala" + _media_metadata_unref0 (meta); +#line 6347 "Photo.c" + goto __catch281_g_error; + } +#line 759 "/home/jens/Source/shotwell/src/Photo.vala" + _g_object_unref0 (outfile); +#line 6352 "Photo.c" + } else { + GdkPixbuf* pixbuf = NULL; + PhotoPreview* _tmp86_; + GdkPixbuf* _tmp87_; + GdkPixbuf* _tmp88_; + PhotoFileWriter* writer = NULL; + BackingPhotoRow* _tmp95_; + const gchar* _tmp96_; + PhotoFileWriter* _tmp97_; + PhotoFileWriter* _tmp98_; + GdkPixbuf* _tmp99_; +#line 764 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp86_ = prev; +#line 764 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp87_ = photo_preview_get_pixbuf (_tmp86_, &_inner_error_); +#line 764 "/home/jens/Source/shotwell/src/Photo.vala" + pixbuf = _tmp87_; +#line 764 "/home/jens/Source/shotwell/src/Photo.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 764 "/home/jens/Source/shotwell/src/Photo.vala" + _backing_photo_row_unref0 (_tmp69_); +#line 764 "/home/jens/Source/shotwell/src/Photo.vala" + _g_bytes_unref0 (pix); +#line 764 "/home/jens/Source/shotwell/src/Photo.vala" + _photo_preview_unref0 (prev); +#line 764 "/home/jens/Source/shotwell/src/Photo.vala" + _media_metadata_unref0 (meta); +#line 6380 "Photo.c" + goto __catch281_g_error; + } +#line 765 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp88_ = pixbuf; +#line 765 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp88_ == NULL) { +#line 766 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:766: Could not get preview pixbuf"); +#line 767 "/home/jens/Source/shotwell/src/Photo.vala" + _g_object_unref0 (pixbuf); +#line 767 "/home/jens/Source/shotwell/src/Photo.vala" + _backing_photo_row_unref0 (_tmp69_); +#line 767 "/home/jens/Source/shotwell/src/Photo.vala" + _g_bytes_unref0 (pix); +#line 767 "/home/jens/Source/shotwell/src/Photo.vala" + _photo_preview_unref0 (prev); +#line 767 "/home/jens/Source/shotwell/src/Photo.vala" + _media_metadata_unref0 (meta); +#line 6399 "Photo.c" + { + gboolean _tmp89_; +#line 786 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp89_ = wrote_img_to_disk; +#line 786 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp89_) { +#line 6406 "Photo.c" + { + RawDeveloper _tmp90_; + BackingPhotoRow* _tmp91_; + gboolean _tmp92_; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp90_ = d; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp91_ = bps; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp92_ = notify; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + photo_add_backing_photo_for_development (self, _tmp90_, _tmp91_, _tmp92_, &_inner_error_); +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 6421 "Photo.c" + goto __catch285_g_error; + } +#line 791 "/home/jens/Source/shotwell/src/Photo.vala" + photo_notify_raw_development_modified (self); +#line 6426 "Photo.c" + } + goto __finally285; + __catch285_g_error: + { + GError* e = NULL; + GError* _tmp93_; + const gchar* _tmp94_; +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" + e = _inner_error_; +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" + _inner_error_ = NULL; +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp93_ = e; +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp94_ = _tmp93_->message; +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp94_); +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" + _g_error_free0 (e); +#line 6446 "Photo.c" + } + __finally285: +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 6451 "Photo.c" + goto __catch281_g_error; + } + } + } +#line 767 "/home/jens/Source/shotwell/src/Photo.vala" + _backing_photo_row_unref0 (bps); +#line 767 "/home/jens/Source/shotwell/src/Photo.vala" + return; +#line 6460 "Photo.c" + } +#line 770 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp95_ = bps; +#line 770 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp96_ = _tmp95_->filepath; +#line 770 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp97_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp96_, &_inner_error_); +#line 770 "/home/jens/Source/shotwell/src/Photo.vala" + writer = _tmp97_; +#line 770 "/home/jens/Source/shotwell/src/Photo.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 770 "/home/jens/Source/shotwell/src/Photo.vala" + _g_object_unref0 (pixbuf); +#line 770 "/home/jens/Source/shotwell/src/Photo.vala" + _backing_photo_row_unref0 (_tmp69_); +#line 770 "/home/jens/Source/shotwell/src/Photo.vala" + _g_bytes_unref0 (pix); +#line 770 "/home/jens/Source/shotwell/src/Photo.vala" + _photo_preview_unref0 (prev); +#line 770 "/home/jens/Source/shotwell/src/Photo.vala" + _media_metadata_unref0 (meta); +#line 6482 "Photo.c" + goto __catch281_g_error; + } +#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp98_ = writer; +#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp99_ = pixbuf; +#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + photo_file_writer_write (_tmp98_, _tmp99_, JPEG_QUALITY_HIGH, &_inner_error_); +#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + _photo_file_adapter_unref0 (writer); +#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + _g_object_unref0 (pixbuf); +#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + _backing_photo_row_unref0 (_tmp69_); +#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + _g_bytes_unref0 (pix); +#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + _photo_preview_unref0 (prev); +#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + _media_metadata_unref0 (meta); +#line 6505 "Photo.c" + goto __catch281_g_error; + } +#line 759 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 762 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp64_); -#line 762 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (pix); -#line 762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 759 "/home/jens/Source/shotwell/src/Photo.vala" + _g_object_unref0 (pixbuf); +#line 6512 "Photo.c" + } +#line 777 "/home/jens/Source/shotwell/src/Photo.vala" + wrote_img_to_disk = TRUE; +#line 780 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp100_ = bps; +#line 780 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp101_ = _tmp100_->filepath; +#line 780 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp102_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp101_, &_inner_error_); +#line 780 "/home/jens/Source/shotwell/src/Photo.vala" + mwriter = _tmp102_; +#line 780 "/home/jens/Source/shotwell/src/Photo.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 780 "/home/jens/Source/shotwell/src/Photo.vala" + _backing_photo_row_unref0 (_tmp69_); +#line 780 "/home/jens/Source/shotwell/src/Photo.vala" + _g_bytes_unref0 (pix); +#line 780 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); -#line 762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 780 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6437 "Photo.c" - goto __catch270_g_error; +#line 6534 "Photo.c" + goto __catch281_g_error; } -#line 763 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = mwriter; -#line 763 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = meta; -#line 763 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp79_, _tmp80_, &_inner_error_); -#line 763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 781 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp103_ = mwriter; +#line 781 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp104_ = meta; +#line 781 "/home/jens/Source/shotwell/src/Photo.vala" + photo_file_metadata_writer_write_metadata (_tmp103_, _tmp104_, &_inner_error_); +#line 781 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 781 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (mwriter); -#line 763 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (writer); -#line 763 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp64_); -#line 763 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (pix); -#line 763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 781 "/home/jens/Source/shotwell/src/Photo.vala" + _backing_photo_row_unref0 (_tmp69_); +#line 781 "/home/jens/Source/shotwell/src/Photo.vala" + _g_bytes_unref0 (pix); +#line 781 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); -#line 763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 781 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6460 "Photo.c" - goto __catch270_g_error; +#line 6555 "Photo.c" + goto __catch281_g_error; } -#line 734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 736 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (mwriter); -#line 734 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (writer); -#line 734 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp64_); -#line 734 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (pix); -#line 734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 736 "/home/jens/Source/shotwell/src/Photo.vala" + _backing_photo_row_unref0 (_tmp69_); +#line 736 "/home/jens/Source/shotwell/src/Photo.vala" + _g_bytes_unref0 (pix); +#line 736 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); -#line 734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 736 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6475 "Photo.c" +#line 6568 "Photo.c" } - goto __finally270; - __catch270_g_error: + goto __finally281; + __catch281_g_error: { GError* e = NULL; - GError* _tmp81_; - const gchar* _tmp82_; -#line 734 "/home/jens/Source/shotwell/src/Photo.vala" + GError* _tmp105_; + const gchar* _tmp106_; +#line 736 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 736 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 765 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = e; -#line 765 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = _tmp81_->message; -#line 765 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:765: Error accessing embedded preview. Message: %s", _tmp82_); -#line 766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 783 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp105_ = e; +#line 783 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp106_ = _tmp105_->message; +#line 783 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:783: Error accessing embedded preview. Message: %s", _tmp106_); +#line 784 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6495 "Photo.c" +#line 6588 "Photo.c" { - gboolean _tmp83_; -#line 768 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = wrote_img_to_disk; -#line 768 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp83_) { -#line 6502 "Photo.c" + gboolean _tmp107_; +#line 786 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp107_ = wrote_img_to_disk; +#line 786 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp107_) { +#line 6595 "Photo.c" { - RawDeveloper _tmp84_; - BackingPhotoRow* _tmp85_; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = d; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = bps; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp84_, _tmp85_, &_inner_error_); -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + RawDeveloper _tmp108_; + BackingPhotoRow* _tmp109_; + gboolean _tmp110_; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp108_ = d; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp109_ = bps; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp110_ = notify; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + photo_add_backing_photo_for_development (self, _tmp108_, _tmp109_, _tmp110_, &_inner_error_); +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6514 "Photo.c" - goto __catch274_g_error; +#line 6610 "Photo.c" + goto __catch286_g_error; } -#line 773 "/home/jens/Source/shotwell/src/Photo.vala" +#line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6519 "Photo.c" +#line 6615 "Photo.c" } - goto __finally274; - __catch274_g_error: + goto __finally286; + __catch286_g_error: { GError* e = NULL; - GError* _tmp86_; - const gchar* _tmp87_; -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" + GError* _tmp111_; + const gchar* _tmp112_; +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = e; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = _tmp86_->message; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp87_); -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp111_ = e; +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp112_ = _tmp111_->message; +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp112_); +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6539 "Photo.c" +#line 6635 "Photo.c" } - __finally274: -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" + __finally286: +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 6546 "Photo.c" +#line 6642 "Photo.c" } } } -#line 766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 784 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 784 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6554 "Photo.c" +#line 6650 "Photo.c" } - __finally270: + __finally281: { - gboolean _tmp88_; -#line 768 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = wrote_img_to_disk; -#line 768 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp88_) { -#line 6563 "Photo.c" + gboolean _tmp113_; +#line 786 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp113_ = wrote_img_to_disk; +#line 786 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp113_) { +#line 6659 "Photo.c" { - RawDeveloper _tmp89_; - BackingPhotoRow* _tmp90_; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = d; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = bps; -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp89_, _tmp90_, &_inner_error_); -#line 771 "/home/jens/Source/shotwell/src/Photo.vala" + RawDeveloper _tmp114_; + BackingPhotoRow* _tmp115_; + gboolean _tmp116_; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp114_ = d; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp115_ = bps; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp116_ = notify; +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" + photo_add_backing_photo_for_development (self, _tmp114_, _tmp115_, _tmp116_, &_inner_error_); +#line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6575 "Photo.c" - goto __catch275_g_error; +#line 6674 "Photo.c" + goto __catch287_g_error; } -#line 773 "/home/jens/Source/shotwell/src/Photo.vala" +#line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6580 "Photo.c" +#line 6679 "Photo.c" } - goto __finally275; - __catch275_g_error: + goto __finally287; + __catch287_g_error: { GError* e = NULL; - GError* _tmp91_; - const gchar* _tmp92_; -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" + GError* _tmp117_; + const gchar* _tmp118_; +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = e; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = _tmp91_->message; -#line 775 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp92_); -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp117_ = e; +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp118_ = _tmp117_->message; +#line 793 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp118_); +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6600 "Photo.c" +#line 6699 "Photo.c" } - __finally275: -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" + __finally287: +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 787 "/home/jens/Source/shotwell/src/Photo.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 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 787 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6613 "Photo.c" +#line 6712 "Photo.c" } } } -#line 734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 736 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 736 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 736 "/home/jens/Source/shotwell/src/Photo.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 734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 736 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 736 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6627 "Photo.c" +#line 6726 "Photo.c" } -#line 780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 798 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 6631 "Photo.c" +#line 6730 "Photo.c" } default: { -#line 783 "/home/jens/Source/shotwell/src/Photo.vala" +#line 801 "/home/jens/Source/shotwell/src/Photo.vala" g_assert_not_reached (); -#line 6637 "Photo.c" +#line 6736 "Photo.c" } } -#line 670 "/home/jens/Source/shotwell/src/Photo.vala" +#line 672 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 6642 "Photo.c" +#line 6741 "Photo.c" } void photo_set_default_raw_developer (Photo* self, RawDeveloper d) { GError * _inner_error_ = NULL; -#line 788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 806 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 6650 "Photo.c" +#line 6749 "Photo.c" { PhotoRow* _tmp0_; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 807 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 6657 "Photo.c" +#line 6756 "Photo.c" { PhotoRow* _tmp1_; RawDeveloper _tmp2_; -#line 790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 808 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 808 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = d; -#line 790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 808 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_->developer = _tmp2_; -#line 6667 "Photo.c" +#line 6766 "Photo.c" } - __finally276: + __finally288: { PhotoRow* _tmp3_; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 807 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 6676 "Photo.c" +#line 6775 "Photo.c" } -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 807 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 807 "/home/jens/Source/shotwell/src/Photo.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 789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 807 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 807 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6686 "Photo.c" +#line 6785 "Photo.c" } } } -void photo_set_raw_developer (Photo* self, RawDeveloper d) { +void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) { PhotoFileFormat _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_; - gboolean _tmp4_; - Alteration* _tmp48_; - Alteration* _tmp49_; + gboolean _tmp4_ = FALSE; + gboolean _tmp5_; + gboolean _tmp51_; GError * _inner_error_ = NULL; -#line 795 "/home/jens/Source/shotwell/src/Photo.vala" +#line 813 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 796 "/home/jens/Source/shotwell/src/Photo.vala" +#line 814 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_master_file_format (self); -#line 796 "/home/jens/Source/shotwell/src/Photo.vala" +#line 814 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { -#line 797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 815 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6708 "Photo.c" +#line 6807 "Photo.c" } -#line 802 "/home/jens/Source/shotwell/src/Photo.vala" +#line 820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_CAMERA); -#line 802 "/home/jens/Source/shotwell/src/Photo.vala" +#line 820 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 6714 "Photo.c" +#line 6813 "Photo.c" RawDeveloper _tmp3_; -#line 802 "/home/jens/Source/shotwell/src/Photo.vala" +#line 820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = d; -#line 802 "/home/jens/Source/shotwell/src/Photo.vala" +#line 820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED; -#line 6720 "Photo.c" +#line 6819 "Photo.c" } else { -#line 802 "/home/jens/Source/shotwell/src/Photo.vala" +#line 820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 6724 "Photo.c" +#line 6823 "Photo.c" } -#line 802 "/home/jens/Source/shotwell/src/Photo.vala" +#line 820 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 821 "/home/jens/Source/shotwell/src/Photo.vala" d = RAW_DEVELOPER_CAMERA; -#line 6730 "Photo.c" +#line 6829 "Photo.c" } -#line 807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED); -#line 807 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp4_) { -#line 808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 825 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp5_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED); +#line 825 "/home/jens/Source/shotwell/src/Photo.vala" + if (!_tmp5_) { +#line 6835 "Photo.c" + RawDeveloper _tmp6_; +#line 825 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp6_ = d; +#line 825 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp4_ = _tmp6_ != RAW_DEVELOPER_CAMERA; +#line 6841 "Photo.c" + } else { +#line 825 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp4_ = FALSE; +#line 6845 "Photo.c" + } +#line 825 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp4_) { +#line 826 "/home/jens/Source/shotwell/src/Photo.vala" d = RAW_DEVELOPER_SHOTWELL; -#line 6738 "Photo.c" +#line 6851 "Photo.c" } { - GeeHashMap* _tmp5_; -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->priv->developments; -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" + GeeHashMap* _tmp7_; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp7_ = self->priv->developments; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 6746 "Photo.c" +#line 6859 "Photo.c" { RawDeveloper stale_raw_developer = 0; - PhotoRow* _tmp6_; - RawDeveloper _tmp7_; - RawDeveloper _tmp8_; - gboolean _tmp9_; - GeeHashMap* _tmp11_; - RawDeveloper _tmp12_; - gboolean _tmp13_; - PhotoRow* _tmp15_; - RawDeveloper _tmp16_; - GeeHashMap* _tmp17_; - RawDeveloper _tmp18_; - gpointer _tmp19_; - PhotoBackingReaders* _tmp20_; - BackingPhotoRow* _tmp21_; - PhotoFileFormat _tmp22_; - BackingPhotoRow* _tmp23_; - const gchar* _tmp24_; - PhotoFileReader* _tmp25_; - BackingPhotoRow* _tmp30_; - Orientation _tmp31_; - gboolean _tmp41_ = FALSE; - RawDeveloper _tmp42_; -#line 811 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; -#line 811 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_->developer; -#line 811 "/home/jens/Source/shotwell/src/Photo.vala" - stale_raw_developer = _tmp7_; -#line 814 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = d; -#line 814 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_is_raw_developer_complete (self, _tmp8_); -#line 814 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp9_) { -#line 6783 "Photo.c" - RawDeveloper _tmp10_; -#line 815 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = d; -#line 815 "/home/jens/Source/shotwell/src/Photo.vala" - photo_develop_photo (self, _tmp10_); -#line 6789 "Photo.c" - } -#line 817 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->priv->developments; -#line 817 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = d; -#line 817 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp12_)); -#line 817 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp13_) { -#line 6799 "Photo.c" + PhotoRow* _tmp8_; + RawDeveloper _tmp9_; + RawDeveloper _tmp10_; + gboolean _tmp11_; + GeeHashMap* _tmp14_; + RawDeveloper _tmp15_; + gboolean _tmp16_; + PhotoRow* _tmp18_; + RawDeveloper _tmp19_; + GeeHashMap* _tmp20_; + RawDeveloper _tmp21_; + gpointer _tmp22_; + PhotoBackingReaders* _tmp23_; + BackingPhotoRow* _tmp24_; + PhotoFileFormat _tmp25_; + BackingPhotoRow* _tmp26_; + const gchar* _tmp27_; + PhotoFileReader* _tmp28_; + BackingPhotoRow* _tmp33_; + Orientation _tmp34_; + gboolean _tmp44_ = FALSE; + RawDeveloper _tmp45_; +#line 829 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp8_ = self->row; +#line 829 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp9_ = _tmp8_->developer; +#line 829 "/home/jens/Source/shotwell/src/Photo.vala" + stale_raw_developer = _tmp9_; +#line 832 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp10_ = d; +#line 832 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp11_ = photo_is_raw_developer_complete (self, _tmp10_); +#line 832 "/home/jens/Source/shotwell/src/Photo.vala" + if (!_tmp11_) { +#line 6896 "Photo.c" + RawDeveloper _tmp12_; + gboolean _tmp13_; +#line 833 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp12_ = d; +#line 833 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp13_ = notify; +#line 833 "/home/jens/Source/shotwell/src/Photo.vala" + photo_develop_photo (self, _tmp12_, _tmp13_); +#line 6905 "Photo.c" + } +#line 835 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp14_ = self->priv->developments; +#line 835 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp15_ = d; +#line 835 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp16_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp15_)); +#line 835 "/home/jens/Source/shotwell/src/Photo.vala" + if (!_tmp16_) { +#line 6915 "Photo.c" { - GeeHashMap* _tmp14_; -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->priv->developments; -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" + GeeHashMap* _tmp17_; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp17_ = self->priv->developments; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6806 "Photo.c" +#line 6922 "Photo.c" } -#line 818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 836 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6810 "Photo.c" +#line 6926 "Photo.c" } -#line 821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 839 "/home/jens/Source/shotwell/src/Photo.vala" photo_revert_to_master (self, FALSE); -#line 824 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = self->row; -#line 824 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = d; -#line 824 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_->developer = _tmp16_; -#line 825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = self->priv->developments; -#line 825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = d; -#line 825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp18_)); -#line 825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 842 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp18_ = self->row; +#line 842 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp19_ = d; +#line 842 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp18_->developer = _tmp19_; +#line 843 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp20_ = self->priv->developments; +#line 843 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp21_ = d; +#line 843 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp21_)); +#line 843 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); -#line 825 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = (BackingPhotoRow*) _tmp19_; -#line 826 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->priv->readers; -#line 826 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = self->backing_photo_row; -#line 826 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->file_format; -#line 826 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = self->backing_photo_row; -#line 826 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_->filepath; -#line 826 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = photo_file_format_create_reader (_tmp22_, _tmp24_); -#line 826 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp20_->developer); -#line 826 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_->developer = _tmp25_; -#line 6846 "Photo.c" +#line 843 "/home/jens/Source/shotwell/src/Photo.vala" + self->backing_photo_row = (BackingPhotoRow*) _tmp22_; +#line 844 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp23_ = self->priv->readers; +#line 844 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp24_ = self->backing_photo_row; +#line 844 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp25_ = _tmp24_->file_format; +#line 844 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp26_ = self->backing_photo_row; +#line 844 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp27_ = _tmp26_->filepath; +#line 844 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp28_ = photo_file_format_create_reader (_tmp25_, _tmp27_); +#line 844 "/home/jens/Source/shotwell/src/Photo.vala" + _photo_file_adapter_unref0 (_tmp23_->developer); +#line 844 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp23_->developer = _tmp28_; +#line 6962 "Photo.c" { - GdkPixbuf* _tmp26_; - GdkPixbuf* _tmp27_; -#line 829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_get_prefetched_copy (self, &_inner_error_); -#line 829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_; -#line 829 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp27_); -#line 829 "/home/jens/Source/shotwell/src/Photo.vala" + GdkPixbuf* _tmp29_; + GdkPixbuf* _tmp30_; +#line 847 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp29_ = photo_get_prefetched_copy (self, &_inner_error_); +#line 847 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp30_ = _tmp29_; +#line 847 "/home/jens/Source/shotwell/src/Photo.vala" + _g_object_unref0 (_tmp30_); +#line 847 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6858 "Photo.c" - goto __catch278_g_error; +#line 6974 "Photo.c" + goto __catch290_g_error; } } - goto __finally278; - __catch278_g_error: + goto __finally290; + __catch290_g_error: { GError* e = NULL; -#line 828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 846 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 846 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 850 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6872 "Photo.c" +#line 6988 "Photo.c" { - GeeHashMap* _tmp28_; -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = self->priv->developments; -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" + GeeHashMap* _tmp31_; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp31_ = self->priv->developments; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6879 "Photo.c" +#line 6995 "Photo.c" } -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 850 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6883 "Photo.c" +#line 6999 "Photo.c" } - __finally278: -#line 828 "/home/jens/Source/shotwell/src/Photo.vala" + __finally290: +#line 846 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6888 "Photo.c" +#line 7004 "Photo.c" { - GeeHashMap* _tmp29_; -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = self->priv->developments; -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" + GeeHashMap* _tmp32_; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp32_ = self->priv->developments; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6895 "Photo.c" +#line 7011 "Photo.c" } -#line 828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 846 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 846 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 846 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6903 "Photo.c" - } -#line 835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = self->backing_photo_row; -#line 835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp30_->original_orientation; -#line 835 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_orientation (self, _tmp31_); -#line 6911 "Photo.c" +#line 7019 "Photo.c" + } +#line 853 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp33_ = self->backing_photo_row; +#line 853 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp34_ = _tmp33_->original_orientation; +#line 853 "/home/jens/Source/shotwell/src/Photo.vala" + photo_set_orientation (self, _tmp34_); +#line 7027 "Photo.c" { - PhotoTable* _tmp32_; - PhotoTable* _tmp33_; - PhotoRow* _tmp34_; - RawDeveloper _tmp35_; - BackingPhotoRow* _tmp36_; - BackingPhotoID _tmp37_; -#line 838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = photo_table_get_instance (); -#line 838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_; -#line 838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = self->row; -#line 838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = d; -#line 838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = self->backing_photo_row; -#line 838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_->id; -#line 838 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_update_raw_development (_tmp33_, _tmp34_, _tmp35_, &_tmp37_, &_inner_error_); -#line 838 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp33_); -#line 838 "/home/jens/Source/shotwell/src/Photo.vala" + PhotoTable* _tmp35_; + PhotoTable* _tmp36_; + PhotoRow* _tmp37_; + RawDeveloper _tmp38_; + BackingPhotoRow* _tmp39_; + BackingPhotoID _tmp40_; +#line 856 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp35_ = photo_table_get_instance (); +#line 856 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp36_ = _tmp35_; +#line 856 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp37_ = self->row; +#line 856 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp38_ = d; +#line 856 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp39_ = self->backing_photo_row; +#line 856 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp40_ = _tmp39_->id; +#line 856 "/home/jens/Source/shotwell/src/Photo.vala" + photo_table_update_raw_development (_tmp36_, _tmp37_, _tmp38_, &_tmp40_, &_inner_error_); +#line 856 "/home/jens/Source/shotwell/src/Photo.vala" + _database_table_unref0 (_tmp36_); +#line 856 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6937 "Photo.c" - goto __catch279_g_error; +#line 7053 "Photo.c" + goto __catch291_g_error; } } - goto __finally279; - __catch279_g_error: + goto __finally291; + __catch291_g_error: { GError* e = NULL; - GError* _tmp38_; - const gchar* _tmp39_; -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" + GError* _tmp41_; + const gchar* _tmp42_; +#line 855 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 855 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 840 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = e; -#line 840 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tmp38_->message; -#line 840 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:840: Error updating database: %s", _tmp39_); -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 858 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp41_ = e; +#line 858 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp42_ = _tmp41_->message; +#line 858 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:858: Error updating database: %s", _tmp42_); +#line 855 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6959 "Photo.c" +#line 7075 "Photo.c" } - __finally279: -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" + __finally291: +#line 855 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6964 "Photo.c" +#line 7080 "Photo.c" { - GeeHashMap* _tmp40_; -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = self->priv->developments; -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" + GeeHashMap* _tmp43_; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp43_ = self->priv->developments; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6971 "Photo.c" +#line 7087 "Photo.c" } -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 855 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 855 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 855 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6979 "Photo.c" - } -#line 847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = stale_raw_developer; -#line 847 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp42_ != RAW_DEVELOPER_CAMERA) { -#line 6985 "Photo.c" - RawDeveloper _tmp43_; - PhotoRow* _tmp44_; - RawDeveloper _tmp45_; -#line 848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = stale_raw_developer; -#line 848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = self->row; -#line 848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _tmp44_->developer; -#line 848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp43_ != _tmp45_; -#line 6997 "Photo.c" - } else { -#line 847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = FALSE; -#line 7001 "Photo.c" +#line 7095 "Photo.c" } -#line 847 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp41_) { -#line 7005 "Photo.c" +#line 865 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp45_ = stale_raw_developer; +#line 865 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp45_ != RAW_DEVELOPER_CAMERA) { +#line 7101 "Photo.c" RawDeveloper _tmp46_; -#line 851 "/home/jens/Source/shotwell/src/Photo.vala" + PhotoRow* _tmp47_; + RawDeveloper _tmp48_; +#line 866 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = stale_raw_developer; -#line 851 "/home/jens/Source/shotwell/src/Photo.vala" - photo_delete_raw_development (self, _tmp46_); -#line 7011 "Photo.c" +#line 866 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp47_ = self->row; +#line 866 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp48_ = _tmp47_->developer; +#line 866 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp44_ = _tmp46_ != _tmp48_; +#line 7113 "Photo.c" + } else { +#line 865 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp44_ = FALSE; +#line 7117 "Photo.c" + } +#line 865 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp44_) { +#line 7121 "Photo.c" + RawDeveloper _tmp49_; +#line 869 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp49_ = stale_raw_developer; +#line 869 "/home/jens/Source/shotwell/src/Photo.vala" + photo_delete_raw_development (self, _tmp49_); +#line 7127 "Photo.c" } } - __finally277: + __finally289: { - GeeHashMap* _tmp47_; -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = self->priv->developments; -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" + GeeHashMap* _tmp50_; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp50_ = self->priv->developments; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7021 "Photo.c" +#line 7137 "Photo.c" } -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 828 "/home/jens/Source/shotwell/src/Photo.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 810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 7031 "Photo.c" +#line 7147 "Photo.c" } } -#line 858 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = alteration_new ("image", "developer"); -#line 858 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_; -#line 858 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp49_); -#line 858 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp49_); -#line 859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 876 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp51_ = notify; +#line 876 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp51_) { +#line 7154 "Photo.c" + Alteration* _tmp52_; + Alteration* _tmp53_; +#line 877 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp52_ = alteration_new ("image", "developer"); +#line 877 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp53_ = _tmp52_; +#line 877 "/home/jens/Source/shotwell/src/Photo.vala" + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp53_); +#line 877 "/home/jens/Source/shotwell/src/Photo.vala" + _alteration_unref0 (_tmp53_); +#line 7165 "Photo.c" + } +#line 878 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_prefetched (self); -#line 7044 "Photo.c" +#line 7169 "Photo.c" } @@ -7048,17 +7173,17 @@ RawDeveloper photo_get_raw_developer (Photo* self) { RawDeveloper result = 0; PhotoRow* _tmp0_; RawDeveloper _tmp1_; -#line 862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 881 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 863 "/home/jens/Source/shotwell/src/Photo.vala" +#line 882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 863 "/home/jens/Source/shotwell/src/Photo.vala" +#line 882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_->developer; -#line 863 "/home/jens/Source/shotwell/src/Photo.vala" +#line 882 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 863 "/home/jens/Source/shotwell/src/Photo.vala" +#line 882 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7062 "Photo.c" +#line 7187 "Photo.c" } @@ -7066,18 +7191,18 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { gboolean result = FALSE; gboolean ret = FALSE; GError * _inner_error_ = NULL; -#line 868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 887 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 888 "/home/jens/Source/shotwell/src/Photo.vala" ret = FALSE; -#line 7074 "Photo.c" +#line 7199 "Photo.c" { GeeHashMap* _tmp0_; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 7081 "Photo.c" +#line 7206 "Photo.c" { GeeHashMap* _tmp1_; RawDeveloper _tmp2_; @@ -7096,162 +7221,162 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { GeeHashMap* _tmp39_; RawDeveloper _tmp40_; gboolean _tmp41_; -#line 872 "/home/jens/Source/shotwell/src/Photo.vala" +#line 891 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->developments; -#line 872 "/home/jens/Source/shotwell/src/Photo.vala" +#line 891 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = d; -#line 872 "/home/jens/Source/shotwell/src/Photo.vala" +#line 891 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_)); -#line 872 "/home/jens/Source/shotwell/src/Photo.vala" +#line 891 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 892 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 7110 "Photo.c" +#line 7235 "Photo.c" { GeeHashMap* _tmp4_; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->developments; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7117 "Photo.c" +#line 7242 "Photo.c" } -#line 873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 892 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7121 "Photo.c" +#line 7246 "Photo.c" } -#line 877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = d; -#line 877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = raw_developer_to_string (_tmp7_); -#line 877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 877 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:877: Delete raw development: %s %s", _tmp6_, _tmp9_); -#line 877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 896 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:896: Delete raw development: %s %s", _tmp6_, _tmp9_); +#line 896 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp9_); -#line 877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 896 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp6_); -#line 878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 897 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->priv->developments; -#line 878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 897 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = d; -#line 878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 897 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp11_)); -#line 878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 897 "/home/jens/Source/shotwell/src/Photo.vala" bpr = (BackingPhotoRow*) _tmp12_; -#line 879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 898 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = bpr; -#line 879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 898 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->filepath; -#line 879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 898 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 7153 "Photo.c" +#line 7278 "Photo.c" GFile* f = NULL; BackingPhotoRow* _tmp15_; const gchar* _tmp16_; GFile* _tmp17_; -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = bpr; -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_->filepath; -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = g_file_new_for_path (_tmp16_); -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 899 "/home/jens/Source/shotwell/src/Photo.vala" f = _tmp17_; -#line 7166 "Photo.c" +#line 7291 "Photo.c" { RawDeveloper _tmp18_; -#line 882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 901 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = d; -#line 882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 901 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_ == RAW_DEVELOPER_CAMERA) { -#line 7173 "Photo.c" +#line 7298 "Photo.c" GFile* _tmp19_; -#line 883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 902 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = f; -#line 883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 902 "/home/jens/Source/shotwell/src/Photo.vala" g_file_trash (_tmp19_, NULL, &_inner_error_); -#line 883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 902 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7181 "Photo.c" - goto __catch281_g_error; +#line 7306 "Photo.c" + goto __catch293_g_error; } } else { GFile* _tmp20_; -#line 885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 904 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = f; -#line 885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 904 "/home/jens/Source/shotwell/src/Photo.vala" g_file_delete (_tmp20_, NULL, &_inner_error_); -#line 885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 904 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7192 "Photo.c" - goto __catch281_g_error; +#line 7317 "Photo.c" + goto __catch293_g_error; } } } - goto __finally281; - __catch281_g_error: + goto __finally293; + __catch293_g_error: { GError* e = NULL; BackingPhotoRow* _tmp21_; const gchar* _tmp22_; GError* _tmp23_; const gchar* _tmp24_; -#line 881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 900 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 900 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 887 "/home/jens/Source/shotwell/src/Photo.vala" +#line 906 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = bpr; -#line 887 "/home/jens/Source/shotwell/src/Photo.vala" +#line 906 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_->filepath; -#line 887 "/home/jens/Source/shotwell/src/Photo.vala" +#line 906 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = e; -#line 887 "/home/jens/Source/shotwell/src/Photo.vala" +#line 906 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_->message; -#line 887 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:887: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_); -#line 881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 906 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:906: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_); +#line 900 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 7221 "Photo.c" +#line 7346 "Photo.c" } - __finally281: -#line 881 "/home/jens/Source/shotwell/src/Photo.vala" + __finally293: +#line 900 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7226 "Photo.c" +#line 7351 "Photo.c" gboolean _tmp26_ = FALSE; -#line 881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 900 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 900 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 900 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 900 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7236 "Photo.c" +#line 7361 "Photo.c" { GeeHashMap* _tmp25_; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->priv->developments; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7243 "Photo.c" +#line 7368 "Photo.c" } -#line 881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 900 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 900 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 900 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp26_; -#line 7251 "Photo.c" +#line 7376 "Photo.c" } -#line 879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 898 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 7255 "Photo.c" +#line 7380 "Photo.c" } { PhotoTable* _tmp27_; @@ -7262,242 +7387,242 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { BackingPhotoTable* _tmp32_; BackingPhotoRow* _tmp33_; BackingPhotoID _tmp34_; -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 912 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = photo_table_get_instance (); -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 912 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_; -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 912 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = self->row; -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 912 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = d; -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 912 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_remove_development (_tmp28_, _tmp29_, _tmp30_, &_inner_error_); -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 912 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp28_); -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 912 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7280 "Photo.c" - goto __catch282_g_error; +#line 7405 "Photo.c" + goto __catch294_g_error; } -#line 894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = backing_photo_table_get_instance (); -#line 894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_; -#line 894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = bpr; -#line 894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_->id; -#line 894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 913 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_remove (_tmp32_, &_tmp34_, &_inner_error_); -#line 894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 913 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp32_); -#line 894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 913 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7297 "Photo.c" - goto __catch282_g_error; +#line 7422 "Photo.c" + goto __catch294_g_error; } } - goto __finally282; - __catch282_g_error: + goto __finally294; + __catch294_g_error: { GError* e = NULL; GError* _tmp35_; const gchar* _tmp36_; -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 911 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 911 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 915 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = e; -#line 896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 915 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = _tmp35_->message; -#line 896 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:896: Database error while deleting RAW development: %s", _tmp36_); -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 915 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:915: Database error while deleting RAW development: %s", _tmp36_); +#line 911 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 7319 "Photo.c" +#line 7444 "Photo.c" } - __finally282: -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" + __finally294: +#line 911 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7324 "Photo.c" +#line 7449 "Photo.c" gboolean _tmp38_ = FALSE; -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 911 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 911 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7330 "Photo.c" +#line 7455 "Photo.c" { GeeHashMap* _tmp37_; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = self->priv->developments; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7337 "Photo.c" +#line 7462 "Photo.c" } -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 911 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 911 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 911 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp38_; -#line 7345 "Photo.c" +#line 7470 "Photo.c" } -#line 899 "/home/jens/Source/shotwell/src/Photo.vala" +#line 918 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = self->priv->developments; -#line 899 "/home/jens/Source/shotwell/src/Photo.vala" +#line 918 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = d; -#line 899 "/home/jens/Source/shotwell/src/Photo.vala" +#line 918 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp40_), NULL); -#line 899 "/home/jens/Source/shotwell/src/Photo.vala" +#line 918 "/home/jens/Source/shotwell/src/Photo.vala" ret = _tmp41_; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7357 "Photo.c" +#line 7482 "Photo.c" } - __finally280: + __finally292: { GeeHashMap* _tmp42_; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = self->priv->developments; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7366 "Photo.c" +#line 7491 "Photo.c" } -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7370 "Photo.c" +#line 7495 "Photo.c" gboolean _tmp43_ = FALSE; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.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 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 890 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp43_; -#line 7378 "Photo.c" +#line 7503 "Photo.c" } } -#line 902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 921 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 922 "/home/jens/Source/shotwell/src/Photo.vala" result = ret; -#line 903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 922 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7387 "Photo.c" +#line 7512 "Photo.c" } void photo_redevelop_raw (Photo* self, RawDeveloper d) { GError * _inner_error_ = NULL; -#line 907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 926 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 7395 "Photo.c" +#line 7520 "Photo.c" { GeeHashMap* _tmp0_; -#line 908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 927 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; -#line 908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 927 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 7402 "Photo.c" +#line 7527 "Photo.c" { RawDeveloper _tmp1_; RawDeveloper dev = 0; RawDeveloper _tmp2_; RawDeveloper _tmp3_; RawDeveloper _tmp4_; -#line 909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = d; -#line 909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" photo_delete_raw_development (self, _tmp1_); -#line 910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 929 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = d; -#line 910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 929 "/home/jens/Source/shotwell/src/Photo.vala" dev = _tmp2_; -#line 911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = dev; -#line 911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 930 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ == RAW_DEVELOPER_CAMERA) { -#line 912 "/home/jens/Source/shotwell/src/Photo.vala" +#line 931 "/home/jens/Source/shotwell/src/Photo.vala" dev = RAW_DEVELOPER_EMBEDDED; -#line 7423 "Photo.c" +#line 7548 "Photo.c" } -#line 914 "/home/jens/Source/shotwell/src/Photo.vala" +#line 933 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = dev; -#line 914 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_raw_developer (self, _tmp4_); -#line 7429 "Photo.c" +#line 933 "/home/jens/Source/shotwell/src/Photo.vala" + photo_set_raw_developer (self, _tmp4_, TRUE); +#line 7554 "Photo.c" } - __finally283: + __finally295: { GeeHashMap* _tmp5_; -#line 908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 927 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->developments; -#line 908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 927 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7438 "Photo.c" +#line 7563 "Photo.c" } -#line 908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 927 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 927 "/home/jens/Source/shotwell/src/Photo.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 908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 927 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 927 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 7448 "Photo.c" +#line 7573 "Photo.c" } } } -static void _vala_array_add85 (BackingFileState** * array, int* length, int* size, BackingFileState* value) { -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add89 (BackingFileState** * array, int* length, int* size, BackingFileState* value) { +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7461 "Photo.c" +#line 7586 "Photo.c" } -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7467 "Photo.c" +#line 7592 "Photo.c" } -static void _vala_array_add86 (BackingFileState** * array, int* length, int* size, BackingFileState* value) { -#line 923 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add90 (BackingFileState** * array, int* length, int* size, BackingFileState* value) { +#line 942 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 942 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 942 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7478 "Photo.c" +#line 7603 "Photo.c" } -#line 923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 942 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 942 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7484 "Photo.c" +#line 7609 "Photo.c" } -static void _vala_array_add87 (BackingFileState** * array, int* length, int* size, BackingFileState* value) { -#line 930 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add91 (BackingFileState** * array, int* length, int* size, BackingFileState* value) { +#line 949 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 949 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 949 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7495 "Photo.c" +#line 7620 "Photo.c" } -#line 930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 949 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 949 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7501 "Photo.c" +#line 7626 "Photo.c" } @@ -7511,24 +7636,24 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, BackingFileState** _tmp27_; gint _tmp27__length1; GError * _inner_error_ = NULL; -#line 918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 937 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = g_new0 (BackingFileState*, 0 + 1); -#line 919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 938 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp0_; -#line 919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 938 "/home/jens/Source/shotwell/src/Photo.vala" backing_length1 = 0; -#line 919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 938 "/home/jens/Source/shotwell/src/Photo.vala" _backing_size_ = backing_length1; -#line 7525 "Photo.c" +#line 7650 "Photo.c" { PhotoRow* _tmp1_; -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 939 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 939 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 7532 "Photo.c" +#line 7657 "Photo.c" { BackingFileState** _tmp2_; gint _tmp2__length1; @@ -7539,73 +7664,73 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, BackingFileState* _tmp7_; gboolean _tmp8_; gboolean _tmp12_; -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = backing; -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2__length1 = backing_length1; -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->master; -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->md5; -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = backing_file_state_new_from_photo_row (_tmp4_, _tmp6_); -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add85 (&backing, &backing_length1, &_backing_size_, _tmp7_); -#line 922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add89 (&backing, &backing_length1, &_backing_size_, _tmp7_); +#line 941 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_has_editable (self); -#line 922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 941 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 7563 "Photo.c" +#line 7688 "Photo.c" BackingFileState** _tmp9_; gint _tmp9__length1; BackingPhotoRow* _tmp10_; BackingFileState* _tmp11_; -#line 923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 942 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = backing; -#line 923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 942 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9__length1 = backing_length1; -#line 923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 942 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->priv->editable; -#line 923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 942 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = backing_file_state_new_from_photo_row (_tmp10_, NULL); -#line 923 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add86 (&backing, &backing_length1, &_backing_size_, _tmp11_); -#line 7578 "Photo.c" +#line 942 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add90 (&backing, &backing_length1, &_backing_size_, _tmp11_); +#line 7703 "Photo.c" } -#line 925 "/home/jens/Source/shotwell/src/Photo.vala" +#line 944 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_is_developed (self); -#line 925 "/home/jens/Source/shotwell/src/Photo.vala" +#line 944 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 7584 "Photo.c" +#line 7709 "Photo.c" GeeCollection* dev_rows = NULL; GeeCollection* _tmp13_; GeeCollection* _tmp14_; -#line 926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 945 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_get_raw_development_photo_rows (self); -#line 926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 945 "/home/jens/Source/shotwell/src/Photo.vala" dev_rows = _tmp13_; -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 946 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = dev_rows; -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 946 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 7596 "Photo.c" +#line 7721 "Photo.c" { GeeIterator* _r_it = NULL; GeeCollection* _tmp15_; GeeIterator* _tmp16_; -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = dev_rows; -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 947 "/home/jens/Source/shotwell/src/Photo.vala" _r_it = _tmp16_; -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 947 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 7609 "Photo.c" +#line 7734 "Photo.c" GeeIterator* _tmp17_; gboolean _tmp18_; BackingPhotoRow* r = NULL; @@ -7617,246 +7742,246 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, gint _tmp23__length1; BackingPhotoRow* _tmp24_; BackingFileState* _tmp25_; -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _r_it; -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = gee_iterator_next (_tmp17_); -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 947 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp18_) { -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 947 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 7629 "Photo.c" +#line 7754 "Photo.c" } -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _r_it; -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = gee_iterator_get (_tmp19_); -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 947 "/home/jens/Source/shotwell/src/Photo.vala" r = (BackingPhotoRow*) _tmp20_; -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 948 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = r; -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 948 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_->filepath; -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:929: adding: %s", _tmp22_); -#line 930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 948 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:948: adding: %s", _tmp22_); +#line 949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = backing; -#line 930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23__length1 = backing_length1; -#line 930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = r; -#line 930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = backing_file_state_new_from_photo_row (_tmp24_, NULL); -#line 930 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add87 (&backing, &backing_length1, &_backing_size_, _tmp25_); -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 949 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add91 (&backing, &backing_length1, &_backing_size_, _tmp25_); +#line 947 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (r); -#line 7655 "Photo.c" +#line 7780 "Photo.c" } -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 947 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_r_it); -#line 7659 "Photo.c" +#line 7784 "Photo.c" } } -#line 925 "/home/jens/Source/shotwell/src/Photo.vala" +#line 944 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dev_rows); -#line 7664 "Photo.c" +#line 7789 "Photo.c" } } - __finally284: + __finally296: { PhotoRow* _tmp26_; -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 939 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = self->row; -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 939 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 7674 "Photo.c" +#line 7799 "Photo.c" } -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 939 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 939 "/home/jens/Source/shotwell/src/Photo.vala" backing = (_vala_array_free (backing, backing_length1, (GDestroyNotify) backing_file_state_unref), NULL); -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 939 "/home/jens/Source/shotwell/src/Photo.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 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 939 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 939 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7686 "Photo.c" +#line 7811 "Photo.c" } } -#line 936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 955 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = backing; -#line 936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 955 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27__length1 = backing_length1; -#line 936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 955 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { -#line 936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 955 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp27__length1; -#line 7697 "Photo.c" +#line 7822 "Photo.c" } -#line 936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 955 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp27_; -#line 936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 955 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7703 "Photo.c" +#line 7828 "Photo.c" } static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode) { PhotoFileReader* result = NULL; BackingFetchMode _tmp0_; -#line 939 "/home/jens/Source/shotwell/src/Photo.vala" +#line 958 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 959 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = mode; -#line 940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 959 "/home/jens/Source/shotwell/src/Photo.vala" switch (_tmp0_) { -#line 940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 959 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_MASTER: -#line 7718 "Photo.c" +#line 7843 "Photo.c" { PhotoFileReader* _tmp1_; -#line 942 "/home/jens/Source/shotwell/src/Photo.vala" +#line 961 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_master_reader (self); -#line 942 "/home/jens/Source/shotwell/src/Photo.vala" +#line 961 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 942 "/home/jens/Source/shotwell/src/Photo.vala" +#line 961 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7727 "Photo.c" +#line 7852 "Photo.c" } -#line 940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 959 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_BASELINE: -#line 7731 "Photo.c" +#line 7856 "Photo.c" { PhotoFileReader* _tmp2_; -#line 945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 964 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_get_baseline_reader (self); -#line 945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 964 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 964 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7740 "Photo.c" +#line 7865 "Photo.c" } -#line 940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 959 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_SOURCE: -#line 7744 "Photo.c" +#line 7869 "Photo.c" { PhotoFileReader* _tmp3_; -#line 948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 967 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_source_reader (self); -#line 948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 967 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 967 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7753 "Photo.c" +#line 7878 "Photo.c" } -#line 940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 959 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_UNMODIFIED: -#line 7757 "Photo.c" +#line 7882 "Photo.c" { PhotoFileFormat _tmp4_; -#line 951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_master_file_format (self); -#line 951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 970 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_ == PHOTO_FILE_FORMAT_RAW) { -#line 7764 "Photo.c" +#line 7889 "Photo.c" PhotoFileReader* _tmp5_; -#line 952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 971 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_get_raw_developer_reader (self); -#line 952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 971 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 971 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7772 "Photo.c" +#line 7897 "Photo.c" } else { PhotoFileReader* _tmp6_; -#line 954 "/home/jens/Source/shotwell/src/Photo.vala" +#line 973 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_get_master_reader (self); -#line 954 "/home/jens/Source/shotwell/src/Photo.vala" +#line 973 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp6_; -#line 954 "/home/jens/Source/shotwell/src/Photo.vala" +#line 973 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7781 "Photo.c" +#line 7906 "Photo.c" } } default: { BackingFetchMode _tmp7_; GEnumValue* _tmp8_; -#line 957 "/home/jens/Source/shotwell/src/Photo.vala" +#line 976 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = mode; -#line 957 "/home/jens/Source/shotwell/src/Photo.vala" +#line 976 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_enum_get_value (g_type_class_ref (TYPE_BACKING_FETCH_MODE), _tmp7_); -#line 957 "/home/jens/Source/shotwell/src/Photo.vala" - g_error ("Photo.vala:957: Unknown backing fetch mode %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL); -#line 7794 "Photo.c" +#line 976 "/home/jens/Source/shotwell/src/Photo.vala" + g_error ("Photo.vala:976: Unknown backing fetch mode %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL); +#line 7919 "Photo.c" } } } static gpointer _photo_file_adapter_ref0 (gpointer self) { -#line 963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 982 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_file_adapter_ref (self) : NULL; -#line 7803 "Photo.c" +#line 7928 "Photo.c" } static PhotoFileReader* photo_get_master_reader (Photo* self) { PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; -#line 961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 980 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 7812 "Photo.c" +#line 7937 "Photo.c" { PhotoBackingReaders* _tmp0_; -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 7819 "Photo.c" +#line 7944 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; PhotoFileReader* _tmp3_; -#line 963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; -#line 963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); -#line 963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 982 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 7832 "Photo.c" +#line 7957 "Photo.c" { PhotoBackingReaders* _tmp4_; -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7839 "Photo.c" +#line 7964 "Photo.c" } -#line 963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 982 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7843 "Photo.c" +#line 7968 "Photo.c" } - __finally285: + __finally297: { PhotoBackingReaders* _tmp5_; -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->readers; -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7852 "Photo.c" +#line 7977 "Photo.c" } -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 981 "/home/jens/Source/shotwell/src/Photo.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 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 981 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 981 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7860 "Photo.c" +#line 7985 "Photo.c" } } @@ -7864,57 +7989,57 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) { PhotoFileReader* photo_get_editable_reader (Photo* self) { PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; -#line 967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 986 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 7870 "Photo.c" +#line 7995 "Photo.c" { PhotoBackingReaders* _tmp0_; -#line 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 7877 "Photo.c" +#line 8002 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; PhotoFileReader* _tmp3_; -#line 969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); -#line 969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 7890 "Photo.c" +#line 8015 "Photo.c" { PhotoBackingReaders* _tmp4_; -#line 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7897 "Photo.c" +#line 8022 "Photo.c" } -#line 969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7901 "Photo.c" +#line 8026 "Photo.c" } - __finally286: + __finally298: { PhotoBackingReaders* _tmp5_; -#line 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->readers; -#line 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7910 "Photo.c" +#line 8035 "Photo.c" } -#line 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 987 "/home/jens/Source/shotwell/src/Photo.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 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 987 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7918 "Photo.c" +#line 8043 "Photo.c" } } @@ -7922,16 +8047,16 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) { static PhotoFileReader* photo_get_baseline_reader (Photo* self) { PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; -#line 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 993 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 7928 "Photo.c" +#line 8053 "Photo.c" { PhotoBackingReaders* _tmp0_; -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 7935 "Photo.c" +#line 8060 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -7940,105 +8065,105 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { PhotoBackingReaders* _tmp13_; PhotoFileReader* _tmp14_; PhotoFileReader* _tmp15_; -#line 976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 995 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 7950 "Photo.c" +#line 8075 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; PhotoFileReader* _tmp5_; -#line 977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 996 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 996 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->editable; -#line 977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 996 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _photo_file_adapter_ref0 (_tmp4_); -#line 977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 996 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 7962 "Photo.c" +#line 8087 "Photo.c" { PhotoBackingReaders* _tmp6_; -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->readers; -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7969 "Photo.c" +#line 8094 "Photo.c" } -#line 977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 996 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7973 "Photo.c" +#line 8098 "Photo.c" } -#line 979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; -#line 979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->developer; -#line 979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 998 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 7981 "Photo.c" +#line 8106 "Photo.c" PhotoBackingReaders* _tmp9_; PhotoFileReader* _tmp10_; PhotoFileReader* _tmp11_; -#line 980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->priv->readers; -#line 980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->developer; -#line 980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _photo_file_adapter_ref0 (_tmp10_); -#line 980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 999 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp11_; -#line 7993 "Photo.c" +#line 8118 "Photo.c" { PhotoBackingReaders* _tmp12_; -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->readers; -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8000 "Photo.c" +#line 8125 "Photo.c" } -#line 980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 999 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8004 "Photo.c" +#line 8129 "Photo.c" } -#line 982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->readers; -#line 982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->master; -#line 982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _photo_file_adapter_ref0 (_tmp14_); -#line 982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp15_; -#line 8014 "Photo.c" +#line 8139 "Photo.c" { PhotoBackingReaders* _tmp16_; -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->readers; -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8021 "Photo.c" +#line 8146 "Photo.c" } -#line 982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8025 "Photo.c" +#line 8150 "Photo.c" } - __finally287: + __finally299: { PhotoBackingReaders* _tmp17_; -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->priv->readers; -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8034 "Photo.c" +#line 8159 "Photo.c" } -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 994 "/home/jens/Source/shotwell/src/Photo.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 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 994 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8042 "Photo.c" +#line 8167 "Photo.c" } } @@ -8046,16 +8171,16 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { static PhotoFileReader* photo_get_source_reader (Photo* self) { PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; -#line 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1006 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8052 "Photo.c" +#line 8177 "Photo.c" { PhotoBackingReaders* _tmp0_; -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8059 "Photo.c" +#line 8184 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8064,105 +8189,105 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { PhotoBackingReaders* _tmp13_; PhotoFileReader* _tmp14_; PhotoFileReader* _tmp15_; -#line 989 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1008 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 989 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1008 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 989 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1008 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8074 "Photo.c" +#line 8199 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; PhotoFileReader* _tmp5_; -#line 990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1009 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1009 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->editable; -#line 990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1009 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _photo_file_adapter_ref0 (_tmp4_); -#line 990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1009 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 8086 "Photo.c" +#line 8211 "Photo.c" { PhotoBackingReaders* _tmp6_; -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->readers; -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8093 "Photo.c" +#line 8218 "Photo.c" } -#line 990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1009 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8097 "Photo.c" +#line 8222 "Photo.c" } -#line 992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1011 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; -#line 992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1011 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->developer; -#line 992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1011 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 8105 "Photo.c" +#line 8230 "Photo.c" PhotoBackingReaders* _tmp9_; PhotoFileReader* _tmp10_; PhotoFileReader* _tmp11_; -#line 993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->priv->readers; -#line 993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->developer; -#line 993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _photo_file_adapter_ref0 (_tmp10_); -#line 993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp11_; -#line 8117 "Photo.c" +#line 8242 "Photo.c" { PhotoBackingReaders* _tmp12_; -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->readers; -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8124 "Photo.c" +#line 8249 "Photo.c" } -#line 993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8128 "Photo.c" +#line 8253 "Photo.c" } -#line 995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->readers; -#line 995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->master; -#line 995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _photo_file_adapter_ref0 (_tmp14_); -#line 995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1014 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp15_; -#line 8138 "Photo.c" +#line 8263 "Photo.c" { PhotoBackingReaders* _tmp16_; -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->readers; -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8145 "Photo.c" +#line 8270 "Photo.c" } -#line 995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1014 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8149 "Photo.c" +#line 8274 "Photo.c" } - __finally288: + __finally300: { PhotoBackingReaders* _tmp17_; -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->priv->readers; -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8158 "Photo.c" +#line 8283 "Photo.c" } -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.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 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8166 "Photo.c" +#line 8291 "Photo.c" } } @@ -8170,57 +8295,57 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; -#line 1000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8176 "Photo.c" +#line 8301 "Photo.c" { PhotoBackingReaders* _tmp0_; -#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8183 "Photo.c" +#line 8308 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; PhotoFileReader* _tmp3_; -#line 1002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->developer; -#line 1002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); -#line 1002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1021 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8196 "Photo.c" +#line 8321 "Photo.c" { PhotoBackingReaders* _tmp4_; -#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8203 "Photo.c" +#line 8328 "Photo.c" } -#line 1002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1021 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8207 "Photo.c" +#line 8332 "Photo.c" } - __finally289: + __finally301: { PhotoBackingReaders* _tmp5_; -#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->readers; -#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8216 "Photo.c" +#line 8341 "Photo.c" } -#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/home/jens/Source/shotwell/src/Photo.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 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8224 "Photo.c" +#line 8349 "Photo.c" } } @@ -8228,55 +8353,55 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { gboolean photo_is_developed (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 1006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1025 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8234 "Photo.c" +#line 8359 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp5_ = FALSE; -#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8242 "Photo.c" +#line 8367 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; -#line 1008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->developer; -#line 1008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8252 "Photo.c" +#line 8377 "Photo.c" { PhotoBackingReaders* _tmp3_; -#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8259 "Photo.c" +#line 8384 "Photo.c" } -#line 1008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8263 "Photo.c" +#line 8388 "Photo.c" } - __finally290: + __finally302: { PhotoBackingReaders* _tmp4_; -#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8272 "Photo.c" +#line 8397 "Photo.c" } -#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.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 1007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 8280 "Photo.c" +#line 8405 "Photo.c" } } @@ -8284,55 +8409,55 @@ gboolean photo_is_developed (Photo* self) { gboolean photo_has_editable (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1031 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8290 "Photo.c" +#line 8415 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp5_ = FALSE; -#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8298 "Photo.c" +#line 8423 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; -#line 1014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 1014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1033 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8308 "Photo.c" +#line 8433 "Photo.c" { PhotoBackingReaders* _tmp3_; -#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8315 "Photo.c" +#line 8440 "Photo.c" } -#line 1014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1033 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8319 "Photo.c" +#line 8444 "Photo.c" } - __finally291: + __finally303: { PhotoBackingReaders* _tmp4_; -#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8328 "Photo.c" +#line 8453 "Photo.c" } -#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.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 1013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 8336 "Photo.c" +#line 8461 "Photo.c" } } @@ -8340,58 +8465,58 @@ gboolean photo_has_editable (Photo* self) { gboolean photo_does_master_exist (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 1018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1037 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8346 "Photo.c" +#line 8471 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp6_ = FALSE; -#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8354 "Photo.c" +#line 8479 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; gboolean _tmp3_; -#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; -#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1039 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8367 "Photo.c" +#line 8492 "Photo.c" { PhotoBackingReaders* _tmp4_; -#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8374 "Photo.c" +#line 8499 "Photo.c" } -#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1039 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8378 "Photo.c" +#line 8503 "Photo.c" } - __finally292: + __finally304: { PhotoBackingReaders* _tmp5_; -#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->readers; -#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8387 "Photo.c" +#line 8512 "Photo.c" } -#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1038 "/home/jens/Source/shotwell/src/Photo.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 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1038 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp6_; -#line 8395 "Photo.c" +#line 8520 "Photo.c" } } @@ -8399,76 +8524,76 @@ gboolean photo_does_master_exist (Photo* self) { gboolean photo_does_editable_exist (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 1025 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1044 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8405 "Photo.c" +#line 8530 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp9_ = FALSE; -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1045 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8413 "Photo.c" +#line 8538 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoBackingReaders* _tmp2_; PhotoFileReader* _tmp3_; -#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->readers; -#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->editable; -#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1046 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 8424 "Photo.c" +#line 8549 "Photo.c" PhotoBackingReaders* _tmp4_; PhotoFileReader* _tmp5_; gboolean _tmp6_; -#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->editable; -#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp6_; -#line 8436 "Photo.c" +#line 8561 "Photo.c" } else { -#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 8440 "Photo.c" +#line 8565 "Photo.c" } -#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1046 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 8444 "Photo.c" +#line 8569 "Photo.c" { PhotoBackingReaders* _tmp7_; -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1045 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8451 "Photo.c" +#line 8576 "Photo.c" } -#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1046 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8455 "Photo.c" +#line 8580 "Photo.c" } - __finally293: + __finally305: { PhotoBackingReaders* _tmp8_; -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1045 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->priv->readers; -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8464 "Photo.c" +#line 8589 "Photo.c" } -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1045 "/home/jens/Source/shotwell/src/Photo.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 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1045 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp9_; -#line 8472 "Photo.c" +#line 8597 "Photo.c" } } @@ -8476,55 +8601,55 @@ gboolean photo_does_editable_exist (Photo* self) { gboolean photo_is_master_baseline (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 1031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1050 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8482 "Photo.c" +#line 8607 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp5_ = FALSE; -#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8490 "Photo.c" +#line 8615 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; -#line 1033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 1033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ == NULL; -#line 8500 "Photo.c" +#line 8625 "Photo.c" { PhotoBackingReaders* _tmp3_; -#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8507 "Photo.c" +#line 8632 "Photo.c" } -#line 1033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8511 "Photo.c" +#line 8636 "Photo.c" } - __finally294: + __finally306: { PhotoBackingReaders* _tmp4_; -#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8520 "Photo.c" +#line 8645 "Photo.c" } -#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1051 "/home/jens/Source/shotwell/src/Photo.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 1032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 8528 "Photo.c" +#line 8653 "Photo.c" } } @@ -8532,70 +8657,70 @@ gboolean photo_is_master_baseline (Photo* self) { gboolean photo_is_master_source (Photo* self) { gboolean result = FALSE; gboolean _tmp0_; -#line 1037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1056 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 1038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_has_editable (self); -#line 1038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" result = !_tmp0_; -#line 1038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8544 "Photo.c" +#line 8669 "Photo.c" } gboolean photo_is_editable_baseline (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 1041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1060 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8553 "Photo.c" +#line 8678 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp5_ = FALSE; -#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8561 "Photo.c" +#line 8686 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; -#line 1043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1062 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1062 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 1043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1062 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8571 "Photo.c" +#line 8696 "Photo.c" { PhotoBackingReaders* _tmp3_; -#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8578 "Photo.c" +#line 8703 "Photo.c" } -#line 1043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1062 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8582 "Photo.c" +#line 8707 "Photo.c" } - __finally295: + __finally307: { PhotoBackingReaders* _tmp4_; -#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8591 "Photo.c" +#line 8716 "Photo.c" } -#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1061 "/home/jens/Source/shotwell/src/Photo.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 1042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 8599 "Photo.c" +#line 8724 "Photo.c" } } @@ -8603,72 +8728,72 @@ gboolean photo_is_editable_baseline (Photo* self) { gboolean photo_is_editable_source (Photo* self) { gboolean result = FALSE; gboolean _tmp0_; -#line 1047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1066 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 1048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_has_editable (self); -#line 1048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 1048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8615 "Photo.c" +#line 8740 "Photo.c" } BackingPhotoRow* photo_get_master_photo_row (Photo* self) { BackingPhotoRow* result = NULL; GError * _inner_error_ = NULL; -#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1070 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8624 "Photo.c" +#line 8749 "Photo.c" { PhotoRow* _tmp0_; -#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1071 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8631 "Photo.c" +#line 8756 "Photo.c" { PhotoRow* _tmp1_; BackingPhotoRow* _tmp2_; BackingPhotoRow* _tmp3_; -#line 1053 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1072 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 1053 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1072 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; -#line 1053 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1072 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _backing_photo_row_ref0 (_tmp2_); -#line 1053 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1072 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8644 "Photo.c" +#line 8769 "Photo.c" { PhotoRow* _tmp4_; -#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1071 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8651 "Photo.c" +#line 8776 "Photo.c" } -#line 1053 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1072 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8655 "Photo.c" +#line 8780 "Photo.c" } - __finally296: + __finally308: { PhotoRow* _tmp5_; -#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1071 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8664 "Photo.c" +#line 8789 "Photo.c" } -#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1071 "/home/jens/Source/shotwell/src/Photo.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 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1071 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1071 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8672 "Photo.c" +#line 8797 "Photo.c" } } @@ -8676,79 +8801,79 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) { BackingPhotoRow* photo_get_editable_photo_row (Photo* self) { BackingPhotoRow* result = NULL; GError * _inner_error_ = NULL; -#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1076 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8682 "Photo.c" +#line 8807 "Photo.c" { PhotoRow* _tmp0_; -#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8689 "Photo.c" +#line 8814 "Photo.c" { PhotoRow* _tmp1_; gboolean _tmp2_; -#line 1060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1079 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 1060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1079 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = backing_photo_id_is_valid (&_tmp1_->editable_id); -#line 1060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1079 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 8699 "Photo.c" +#line 8824 "Photo.c" BackingPhotoRow* _tmp3_; BackingPhotoRow* _tmp4_; -#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->editable; -#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _backing_photo_row_ref0 (_tmp3_); -#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1080 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 8708 "Photo.c" +#line 8833 "Photo.c" { PhotoRow* _tmp5_; -#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8715 "Photo.c" +#line 8840 "Photo.c" } -#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1080 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8719 "Photo.c" +#line 8844 "Photo.c" } else { -#line 1063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1082 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 8723 "Photo.c" +#line 8848 "Photo.c" { PhotoRow* _tmp6_; -#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8730 "Photo.c" +#line 8855 "Photo.c" } -#line 1063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1082 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8734 "Photo.c" +#line 8859 "Photo.c" } } - __finally297: + __finally309: { PhotoRow* _tmp7_; -#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8744 "Photo.c" +#line 8869 "Photo.c" } -#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1077 "/home/jens/Source/shotwell/src/Photo.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 1058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1077 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8752 "Photo.c" +#line 8877 "Photo.c" } } @@ -8756,76 +8881,76 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) { GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { GeeCollection* result = NULL; GError * _inner_error_ = NULL; -#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1086 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8762 "Photo.c" +#line 8887 "Photo.c" { PhotoRow* _tmp0_; -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1087 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1087 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8769 "Photo.c" +#line 8894 "Photo.c" { GeeCollection* _tmp1_ = NULL; GeeHashMap* _tmp2_; -#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->developments; -#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8777 "Photo.c" +#line 8902 "Photo.c" GeeHashMap* _tmp3_; GeeCollection* _tmp4_; GeeCollection* _tmp5_; -#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->developments; -#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp5_; -#line 8791 "Photo.c" +#line 8916 "Photo.c" } else { -#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 8797 "Photo.c" +#line 8922 "Photo.c" } -#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 8801 "Photo.c" +#line 8926 "Photo.c" { PhotoRow* _tmp6_; -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1087 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1087 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8808 "Photo.c" +#line 8933 "Photo.c" } -#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8812 "Photo.c" +#line 8937 "Photo.c" } - __finally298: + __finally310: { PhotoRow* _tmp7_; -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1087 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1087 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8821 "Photo.c" +#line 8946 "Photo.c" } -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1087 "/home/jens/Source/shotwell/src/Photo.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 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1087 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1087 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8829 "Photo.c" +#line 8954 "Photo.c" } } @@ -8833,96 +8958,96 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper d) { BackingPhotoRow* result = NULL; GError * _inner_error_ = NULL; -#line 1073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1092 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8839 "Photo.c" +#line 8964 "Photo.c" { PhotoRow* _tmp0_; -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1093 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1093 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8846 "Photo.c" +#line 8971 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; GeeHashMap* _tmp2_; -#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->developments; -#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8854 "Photo.c" +#line 8979 "Photo.c" GeeHashMap* _tmp3_; RawDeveloper _tmp4_; gpointer _tmp5_; -#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->developments; -#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = d; -#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp4_)); -#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = (BackingPhotoRow*) _tmp5_; -#line 8868 "Photo.c" +#line 8993 "Photo.c" } else { -#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 8874 "Photo.c" +#line 8999 "Photo.c" } -#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 8878 "Photo.c" +#line 9003 "Photo.c" { PhotoRow* _tmp6_; -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1093 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1093 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8885 "Photo.c" +#line 9010 "Photo.c" } -#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8889 "Photo.c" +#line 9014 "Photo.c" } - __finally299: + __finally311: { PhotoRow* _tmp7_; -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1093 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1093 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8898 "Photo.c" +#line 9023 "Photo.c" } -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1093 "/home/jens/Source/shotwell/src/Photo.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 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1093 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1093 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8906 "Photo.c" +#line 9031 "Photo.c" } } static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) { PhotoFileFormat* dup; -#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1104 "/home/jens/Source/shotwell/src/Photo.vala" dup = g_new0 (PhotoFileFormat, 1); -#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1104 "/home/jens/Source/shotwell/src/Photo.vala" memcpy (dup, self, sizeof (PhotoFileFormat)); -#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1104 "/home/jens/Source/shotwell/src/Photo.vala" return dup; -#line 8919 "Photo.c" +#line 9044 "Photo.c" } static gpointer __photo_file_format_dup0 (gpointer self) { -#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1104 "/home/jens/Source/shotwell/src/Photo.vala" return self ? _photo_file_format_dup (self) : NULL; -#line 8926 "Photo.c" +#line 9051 "Photo.c" } @@ -8934,37 +9059,37 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) { PhotoFileReader* _tmp2_; PhotoFileFormat _tmp3_; PhotoFileFormat* _tmp4_; -#line 1079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1098 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 1080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_editable_reader (self); -#line 1080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1099 "/home/jens/Source/shotwell/src/Photo.vala" reader = _tmp0_; -#line 1081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = reader; -#line 1081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1100 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 1082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1101 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 1082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1101 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 1082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1101 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8954 "Photo.c" +#line 9079 "Photo.c" } -#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1104 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; -#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1104 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1104 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = __photo_file_format_dup0 (&_tmp3_); -#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1104 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1104 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1104 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8968 "Photo.c" +#line 9093 "Photo.c" } @@ -8974,75 +9099,75 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma PhotoFileFormat _tmp0_; ExportFormatParameters _tmp1_; ExportFormatMode _tmp2_; -#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1107 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1107 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (params != NULL, 0); -#line 1089 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1108 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_file_format_get_system_default_format (); -#line 1089 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1108 "/home/jens/Source/shotwell/src/Photo.vala" _result_ = _tmp0_; -#line 1091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1110 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *params; -#line 1091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1110 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_.mode; -#line 1091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1110 "/home/jens/Source/shotwell/src/Photo.vala" switch (_tmp2_) { -#line 1091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1110 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_UNMODIFIED: -#line 8994 "Photo.c" +#line 9119 "Photo.c" { PhotoFileFormat _tmp3_; -#line 1093 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1112 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_master_file_format (self); -#line 1093 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1112 "/home/jens/Source/shotwell/src/Photo.vala" _result_ = _tmp3_; -#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1113 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9003 "Photo.c" +#line 9128 "Photo.c" } -#line 1091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1110 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_CURRENT: -#line 9007 "Photo.c" +#line 9132 "Photo.c" { PhotoFileFormat _tmp4_; -#line 1097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_best_export_file_format (self); -#line 1097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" _result_ = _tmp4_; -#line 1098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1117 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9016 "Photo.c" +#line 9141 "Photo.c" } -#line 1091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1110 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_SPECIFIED: -#line 9020 "Photo.c" +#line 9145 "Photo.c" { ExportFormatParameters _tmp5_; PhotoFileFormat _tmp6_; -#line 1101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1120 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = *params; -#line 1101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1120 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_.specified_format; -#line 1101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1120 "/home/jens/Source/shotwell/src/Photo.vala" _result_ = _tmp6_; -#line 1102 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1121 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9032 "Photo.c" +#line 9157 "Photo.c" } default: { -#line 1105 "/home/jens/Source/shotwell/src/Photo.vala" - g_error ("Photo.vala:1105: get_export_format_for_parameters: unsupported export " \ +#line 1124 "/home/jens/Source/shotwell/src/Photo.vala" + g_error ("Photo.vala:1124: get_export_format_for_parameters: unsupported export " \ "format mode"); -#line 9038 "Photo.c" +#line 9163 "Photo.c" } } -#line 1108 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1127 "/home/jens/Source/shotwell/src/Photo.vala" result = _result_; -#line 1108 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1127 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9045 "Photo.c" +#line 9170 "Photo.c" } @@ -9052,81 +9177,81 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame ExportFormatParameters _tmp0_; ExportFormatMode _tmp1_; const gchar* _tmp8_; -#line 1111 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1130 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 1111 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1130 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (params != NULL, NULL); -#line 1112 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1131 "/home/jens/Source/shotwell/src/Photo.vala" _result_ = NULL; -#line 1114 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1133 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = *params; -#line 1114 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1133 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_.mode; -#line 1114 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1133 "/home/jens/Source/shotwell/src/Photo.vala" switch (_tmp1_) { -#line 1114 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1133 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_UNMODIFIED: -#line 9069 "Photo.c" +#line 9194 "Photo.c" { GFile* _tmp2_; GFile* _tmp3_; gchar* _tmp4_; -#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = g_file_get_basename (_tmp3_); -#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1135 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_result_); -#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1135 "/home/jens/Source/shotwell/src/Photo.vala" _result_ = _tmp4_; -#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1135 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 1117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1136 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9088 "Photo.c" +#line 9213 "Photo.c" } -#line 1114 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1133 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_CURRENT: -#line 1114 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1133 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_SPECIFIED: -#line 9094 "Photo.c" +#line 9219 "Photo.c" { ExportFormatParameters _tmp5_; PhotoFileFormat _tmp6_; gchar* _tmp7_; -#line 1121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1140 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = *params; -#line 1121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1140 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_get_export_format_for_parameters (self, &_tmp5_); -#line 1121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1140 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_get_export_basename (self, &_tmp6_); -#line 1121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1140 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp7_; -#line 1121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1140 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_result_); -#line 1121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1140 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9111 "Photo.c" +#line 9236 "Photo.c" } default: { -#line 1124 "/home/jens/Source/shotwell/src/Photo.vala" - g_error ("Photo.vala:1124: get_export_basename_for_parameters: unsupported expor" \ +#line 1143 "/home/jens/Source/shotwell/src/Photo.vala" + g_error ("Photo.vala:1143: get_export_basename_for_parameters: unsupported expor" \ "t format mode"); -#line 9117 "Photo.c" +#line 9242 "Photo.c" } } -#line 1127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1146 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _result_; -#line 1127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1146 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp8_ != NULL, "result != null"); -#line 1128 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1147 "/home/jens/Source/shotwell/src/Photo.vala" result = _result_; -#line 1128 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1147 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9128 "Photo.c" +#line 9253 "Photo.c" } @@ -9255,243 +9380,243 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { PhotoImportParams* _tmp176_; Thumbnails* _tmp177_; GError * _inner_error_ = NULL; -#line 1143 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1162 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0); -#line 1147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = params; -#line 1147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_->file; -#line 1147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 1147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp2_; -#line 1149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1168 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 9269 "Photo.c" +#line 9394 "Photo.c" { GFileInfo* _tmp3_ = NULL; GFile* _tmp4_; GFileInfo* _tmp5_; GFileInfo* _tmp6_; -#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = file; -#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = g_file_query_info (_tmp4_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); -#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp5_; -#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1170 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9283 "Photo.c" - goto __catch300_g_error; +#line 9408 "Photo.c" + goto __catch312_g_error; } -#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp3_; -#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = NULL; -#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1170 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1170 "/home/jens/Source/shotwell/src/Photo.vala" info = _tmp6_; -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 9296 "Photo.c" +#line 9421 "Photo.c" } - goto __finally300; - __catch300_g_error: + goto __finally312; + __catch312_g_error: { GError* err = NULL; -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1154 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1173 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_FILE_ERROR; -#line 1154 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1173 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 1154 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1173 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1154 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1173 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1154 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1173 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9316 "Photo.c" +#line 9441 "Photo.c" } - __finally300: -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" + __finally312: +#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1169 "/home/jens/Source/shotwell/src/Photo.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 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 9331 "Photo.c" +#line 9456 "Photo.c" } -#line 1157 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1176 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = info; -#line 1157 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1176 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_file_info_get_file_type (_tmp7_); -#line 1157 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1176 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != G_FILE_TYPE_REGULAR) { -#line 1158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1177 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_NOT_A_FILE; -#line 1158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1177 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1177 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1177 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9347 "Photo.c" +#line 9472 "Photo.c" } -#line 1160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = file; -#line 1160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_is_file_image (_tmp9_); -#line 1160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp10_) { -#line 9355 "Photo.c" +#line 9480 "Photo.c" GFile* _tmp11_; gchar* _tmp12_; gchar* _tmp13_; -#line 1161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = file; -#line 1161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = g_file_get_path (_tmp11_); -#line 1161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 1161 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:1161: Not importing %s: Not an image file", _tmp13_); -#line 1161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" + g_message ("Photo.vala:1180: Not importing %s: Not an image file", _tmp13_); +#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp13_); -#line 1163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1182 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_NOT_AN_IMAGE; -#line 1163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1182 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1182 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1182 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9377 "Photo.c" +#line 9502 "Photo.c" } -#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = file; -#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_file_format_is_file_supported (_tmp14_); -#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp15_) { -#line 9385 "Photo.c" +#line 9510 "Photo.c" GFile* _tmp16_; gchar* _tmp17_; gchar* _tmp18_; -#line 1167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = file; -#line 1167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = g_file_get_path (_tmp16_); -#line 1167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_; -#line 1167 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:1167: Not importing %s: Unsupported extension", _tmp18_); -#line 1167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1186 "/home/jens/Source/shotwell/src/Photo.vala" + g_message ("Photo.vala:1186: Not importing %s: Unsupported extension", _tmp18_); +#line 1186 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp18_); -#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1188 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; -#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1188 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1188 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1188 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9407 "Photo.c" +#line 9532 "Photo.c" } -#line 1172 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1191 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = info; -#line 1172 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1191 "/home/jens/Source/shotwell/src/Photo.vala" g_file_info_get_modification_time (_tmp19_, &_tmp20_); -#line 1172 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1191 "/home/jens/Source/shotwell/src/Photo.vala" timestamp = _tmp20_; -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = params; -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_->exif_md5; -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_ != NULL) { -#line 9421 "Photo.c" +#line 9546 "Photo.c" PhotoImportParams* _tmp25_; const gchar* _tmp26_; -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = params; -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_->thumbnail_md5; -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp26_ != NULL; -#line 9430 "Photo.c" +#line 9555 "Photo.c" } else { -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = FALSE; -#line 9434 "Photo.c" +#line 9559 "Photo.c" } -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_) { -#line 9438 "Photo.c" +#line 9563 "Photo.c" PhotoImportParams* _tmp27_; const gchar* _tmp28_; -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = params; -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_->full_md5; -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp28_ != NULL; -#line 9447 "Photo.c" +#line 9572 "Photo.c" } else { -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = FALSE; -#line 9451 "Photo.c" +#line 9576 "Photo.c" } -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 9455 "Photo.c" +#line 9580 "Photo.c" PhotoImportParams* _tmp29_; PhotoImportParams* _tmp30_; PhotoFileSnifferOptions _tmp31_; -#line 1176 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1195 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = params; -#line 1176 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1195 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = params; -#line 1176 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1195 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_->sniffer_options; -#line 1176 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1195 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_->sniffer_options = _tmp31_ | PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5; -#line 9467 "Photo.c" +#line 9592 "Photo.c" } -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = file; -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = params; -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_->sniffer_options; -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_file_interrogator_new (_tmp32_, _tmp34_); -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" interrogator = _tmp35_; -#line 9479 "Photo.c" +#line 9604 "Photo.c" { PhotoFileInterrogator* _tmp36_; -#line 1181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = interrogator; -#line 1181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (_tmp36_, &_inner_error_); -#line 1181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9488 "Photo.c" - goto __catch301_g_error; +#line 9613 "Photo.c" + goto __catch313_g_error; } } - goto __finally301; - __catch301_g_error: + goto __finally313; + __catch313_g_error: { GError* err = NULL; GFile* _tmp37_; @@ -9499,120 +9624,120 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { gchar* _tmp39_; GError* _tmp40_; const gchar* _tmp41_; -#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1202 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = file; -#line 1183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1202 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = g_file_get_path (_tmp37_); -#line 1183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1202 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp38_; -#line 1183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1202 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = err; -#line 1183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1202 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_->message; -#line 1183 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1183: Unable to interrogate photo file %s: %s", _tmp39_, _tmp41_); -#line 1183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1202 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:1202: Unable to interrogate photo file %s: %s", _tmp39_, _tmp41_); +#line 1202 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp39_); -#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1204 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_DECODE_ERROR; -#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1204 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1204 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1204 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1204 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1204 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9531 "Photo.c" +#line 9656 "Photo.c" } - __finally301: -#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" + __finally313: +#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1199 "/home/jens/Source/shotwell/src/Photo.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 1180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 9548 "Photo.c" +#line 9673 "Photo.c" } -#line 1188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1207 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = interrogator; -#line 1188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1207 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = photo_file_interrogator_get_is_photo_corrupted (_tmp42_); -#line 1188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1207 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp43_) { -#line 1189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1208 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_NOT_AN_IMAGE; -#line 1189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1208 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1208 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1208 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1208 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9566 "Photo.c" +#line 9691 "Photo.c" } -#line 1192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1211 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = interrogator; -#line 1192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1211 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = photo_file_interrogator_get_detected_photo_information (_tmp44_); -#line 1192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1211 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp45_; -#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = detected; -#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1212 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp47_ == NULL) { -#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = TRUE; -#line 9580 "Photo.c" +#line 9705 "Photo.c" } else { DetectedPhotoInformation* _tmp48_; PhotoFileFormat _tmp49_; -#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = detected; -#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = _tmp48_->file_format; -#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = _tmp49_ == PHOTO_FILE_FORMAT_UNKNOWN; -#line 9590 "Photo.c" +#line 9715 "Photo.c" } -#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1212 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp46_) { -#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1213 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; -#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1213 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1213 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1213 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1213 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1213 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9606 "Photo.c" +#line 9731 "Photo.c" } -#line 1197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1216 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = params; -#line 1197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1216 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = _tmp50_->sniffer_options; -#line 1197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1216 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp51_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) != 0) { -#line 9614 "Photo.c" +#line 9739 "Photo.c" DetectedPhotoInformation* _tmp52_; PhotoImportParams* _tmp53_; const gchar* _tmp54_; @@ -9625,65 +9750,65 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { PhotoImportParams* _tmp61_; const gchar* _tmp62_; gchar* _tmp63_; -#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = detected; -#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = params; -#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = _tmp53_->exif_md5; -#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = g_strdup (_tmp54_); -#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp52_->exif_md5); -#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_->exif_md5 = _tmp55_; -#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = detected; -#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = params; -#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = _tmp57_->thumbnail_md5; -#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = g_strdup (_tmp58_); -#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1218 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp56_->thumbnail_md5); -#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_->thumbnail_md5 = _tmp59_; -#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = detected; -#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = params; -#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = _tmp61_->full_md5; -#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = g_strdup (_tmp62_); -#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp60_->md5); -#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_->md5 = _tmp63_; -#line 9663 "Photo.c" +#line 9788 "Photo.c" } -#line 1203 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" orientation = ORIENTATION_TOP_LEFT; -#line 1204 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1223 "/home/jens/Source/shotwell/src/Photo.vala" exposure_time = (time_t) 0; -#line 1205 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1224 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = g_strdup (""); -#line 1205 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1224 "/home/jens/Source/shotwell/src/Photo.vala" title = _tmp64_; -#line 1206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1225 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = g_strdup (""); -#line 1206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1225 "/home/jens/Source/shotwell/src/Photo.vala" comment = _tmp65_; -#line 1207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1226 "/home/jens/Source/shotwell/src/Photo.vala" rating = RATING_UNRATED; -#line 1214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1233 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = detected; -#line 1214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1233 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = _tmp66_->metadata; -#line 1214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1233 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp67_ != NULL) { -#line 9685 "Photo.c" +#line 9810 "Photo.c" MetadataDateTime* date_time = NULL; DetectedPhotoInformation* _tmp68_; PhotoMetadata* _tmp69_; @@ -9705,362 +9830,362 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { DetectedPhotoInformation* _tmp87_; PhotoMetadata* _tmp88_; Rating _tmp89_; -#line 1215 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = detected; -#line 1215 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = _tmp68_->metadata; -#line 1215 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = photo_metadata_get_exposure_date_time (_tmp69_); -#line 1215 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1234 "/home/jens/Source/shotwell/src/Photo.vala" date_time = _tmp70_; -#line 1216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1235 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = date_time; -#line 1216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1235 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp71_ != NULL) { -#line 9719 "Photo.c" +#line 9844 "Photo.c" MetadataDateTime* _tmp72_; time_t _tmp73_; -#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1236 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = date_time; -#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1236 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = metadata_date_time_get_timestamp (_tmp72_); -#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1236 "/home/jens/Source/shotwell/src/Photo.vala" exposure_time = _tmp73_; -#line 9728 "Photo.c" +#line 9853 "Photo.c" } -#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = detected; -#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = _tmp74_->metadata; -#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = photo_metadata_get_orientation (_tmp75_); -#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" orientation = _tmp76_; -#line 1220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = detected; -#line 1220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = _tmp77_->metadata; -#line 1220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 1220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" title = _tmp79_; -#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = detected; -#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = _tmp80_->metadata; -#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" comment = _tmp82_; -#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = params; -#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = detected; -#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = _tmp84_->metadata; -#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = photo_metadata_get_keywords (_tmp85_, NULL, NULL, NULL); -#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp83_->keywords); -#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_->keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = detected; -#line 1223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = _tmp87_->metadata; -#line 1223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = photo_metadata_get_rating (_tmp88_); -#line 1223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" rating = _tmp89_; -#line 1214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1233 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 9780 "Photo.c" +#line 9905 "Photo.c" } -#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = detected; -#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = _tmp92_->colorspace; -#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp93_ != GDK_COLORSPACE_RGB) { -#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = TRUE; -#line 9790 "Photo.c" +#line 9915 "Photo.c" } else { DetectedPhotoInformation* _tmp94_; gint _tmp95_; -#line 1228 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1247 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = detected; -#line 1228 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1247 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = _tmp94_->channels; -#line 1228 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1247 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = _tmp95_ < 3; -#line 9800 "Photo.c" +#line 9925 "Photo.c" } -#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp91_) { -#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = TRUE; -#line 9806 "Photo.c" +#line 9931 "Photo.c" } else { DetectedPhotoInformation* _tmp96_; gint _tmp97_; -#line 1229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = detected; -#line 1229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = _tmp96_->bits_per_channel; -#line 1229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tmp97_ != 8; -#line 9816 "Photo.c" +#line 9941 "Photo.c" } -#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp90_) { -#line 9820 "Photo.c" +#line 9945 "Photo.c" GFile* _tmp98_; gchar* _tmp99_; gchar* _tmp100_; -#line 1230 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = file; -#line 1230 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = g_file_get_path (_tmp98_); -#line 1230 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = _tmp99_; -#line 1230 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:1230: Not importing %s: Unsupported color format", _tmp100_); -#line 1230 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" + g_message ("Photo.vala:1249: Not importing %s: Unsupported color format", _tmp100_); +#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp100_); -#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; -#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9850 "Photo.c" +#line 9975 "Photo.c" } -#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1257 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = params; -#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1257 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = _tmp101_->row; -#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1257 "/home/jens/Source/shotwell/src/Photo.vala" photo_id_init (&_tmp102_->photo_id, PHOTO_ID_INVALID); -#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1258 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = params; -#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1258 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = _tmp103_->row; -#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1258 "/home/jens/Source/shotwell/src/Photo.vala" _tmp105_ = _tmp104_->master; -#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1258 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = file; -#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1258 "/home/jens/Source/shotwell/src/Photo.vala" _tmp107_ = g_file_get_path (_tmp106_); -#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1258 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp105_->filepath); -#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1258 "/home/jens/Source/shotwell/src/Photo.vala" _tmp105_->filepath = _tmp107_; -#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = params; -#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" _tmp109_ = _tmp108_->row; -#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110_ = _tmp109_->master; -#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" _tmp111_ = detected; -#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" _tmp112_ = _tmp111_->image_dim; -#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110_->dim = _tmp112_; -#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = params; -#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_ = _tmp113_->row; -#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp115_ = _tmp114_->master; -#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp116_ = info; -#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp117_ = g_file_info_get_size (_tmp116_); -#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp115_->filesize = _tmp117_; -#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp118_ = params; -#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp119_ = _tmp118_->row; -#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp120_ = _tmp119_->master; -#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = timestamp; -#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp122_ = _tmp121_.tv_sec; -#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp120_->timestamp = (time_t) _tmp122_; -#line 1243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = params; -#line 1243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124_ = _tmp123_->row; -#line 1243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" _tmp125_ = exposure_time; -#line 1243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124_->exposure_time = _tmp125_; -#line 1244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp126_ = params; -#line 1244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp127_ = _tmp126_->row; -#line 1244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp128_ = orientation; -#line 1244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp127_->orientation = _tmp128_; -#line 1245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp129_ = params; -#line 1245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp130_ = _tmp129_->row; -#line 1245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp131_ = _tmp130_->master; -#line 1245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp132_ = orientation; -#line 1245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp131_->original_orientation = _tmp132_; -#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp133_ = params; -#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp134_ = _tmp133_->row; -#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp135_ = params; -#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp136_ = _tmp135_->import_id; -#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp134_->import_id = _tmp136_; -#line 1247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1266 "/home/jens/Source/shotwell/src/Photo.vala" _tmp137_ = params; -#line 1247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1266 "/home/jens/Source/shotwell/src/Photo.vala" _tmp138_ = _tmp137_->row; -#line 1247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1266 "/home/jens/Source/shotwell/src/Photo.vala" event_id_init (&_tmp138_->event_id, EVENT_ID_INVALID); -#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" _tmp139_ = params; -#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" _tmp140_ = _tmp139_->row; -#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp140_->transformations); -#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" _tmp140_->transformations = NULL; -#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp141_ = params; -#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp142_ = _tmp141_->row; -#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp143_ = detected; -#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp144_ = _tmp143_->md5; -#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp145_ = g_strdup (_tmp144_); -#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1268 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp142_->md5); -#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp142_->md5 = _tmp145_; -#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1269 "/home/jens/Source/shotwell/src/Photo.vala" _tmp146_ = params; -#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1269 "/home/jens/Source/shotwell/src/Photo.vala" _tmp147_ = _tmp146_->row; -#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1269 "/home/jens/Source/shotwell/src/Photo.vala" _tmp148_ = detected; -#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1269 "/home/jens/Source/shotwell/src/Photo.vala" _tmp149_ = _tmp148_->thumbnail_md5; -#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1269 "/home/jens/Source/shotwell/src/Photo.vala" _tmp150_ = g_strdup (_tmp149_); -#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1269 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp147_->thumbnail_md5); -#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1269 "/home/jens/Source/shotwell/src/Photo.vala" _tmp147_->thumbnail_md5 = _tmp150_; -#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp151_ = params; -#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp152_ = _tmp151_->row; -#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp153_ = detected; -#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp154_ = _tmp153_->exif_md5; -#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp155_ = g_strdup (_tmp154_); -#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1270 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp152_->exif_md5); -#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp152_->exif_md5 = _tmp155_; -#line 1252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp156_ = params; -#line 1252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp157_ = _tmp156_->row; -#line 1252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp157_->time_created = (time_t) 0; -#line 1253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp158_ = params; -#line 1253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp159_ = _tmp158_->row; -#line 1253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp159_->flags = (guint64) 0; -#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp160_ = params; -#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp161_ = _tmp160_->row; -#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp162_ = _tmp161_->master; -#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp163_ = detected; -#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp164_ = _tmp163_->file_format; -#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp162_->file_format = _tmp164_; -#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp165_ = params; -#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp166_ = _tmp165_->row; -#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp167_ = title; -#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp168_ = g_strdup (_tmp167_); -#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp166_->title); -#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp166_->title = _tmp168_; -#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp169_ = params; -#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp170_ = _tmp169_->row; -#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp171_ = comment; -#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp172_ = g_strdup (_tmp171_); -#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1275 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp170_->comment); -#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp170_->comment = _tmp172_; -#line 1257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp173_ = params; -#line 1257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp174_ = _tmp173_->row; -#line 1257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp175_ = rating; -#line 1257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp174_->rating = _tmp175_; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" _tmp176_ = params; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" _tmp177_ = _tmp176_->thumbnails; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp177_ != NULL) { -#line 10062 "Photo.c" +#line 10187 "Photo.c" PhotoFileReader* reader = NULL; PhotoImportParams* _tmp178_; PhotoRow* _tmp179_; @@ -10072,31 +10197,31 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { const gchar* _tmp185_; PhotoFileReader* _tmp186_; PhotoFileReader* _tmp187_; -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp178_ = params; -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp179_ = _tmp178_->row; -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp180_ = _tmp179_->master; -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp181_ = _tmp180_->file_format; -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp182_ = params; -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp183_ = _tmp182_->row; -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp184_ = _tmp183_->master; -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp185_ = _tmp184_->filepath; -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp186_ = photo_file_format_create_reader (_tmp181_, _tmp185_); -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" reader = _tmp186_; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp187_ = reader; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_reader_set_role (_tmp187_, PHOTO_FILE_READER_ROLE_THUMBNAIL); -#line 10098 "Photo.c" +#line 10223 "Photo.c" { PhotoImportParams* _tmp188_; Thumbnails* _tmp189_; @@ -10108,116 +10233,116 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { PhotoRow* _tmp195_; BackingPhotoRow* _tmp196_; Dimensions _tmp197_; -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp188_ = params; -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp189_ = _tmp188_->thumbnails; -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp190_ = reader; -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp191_ = params; -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp192_ = _tmp191_->row; -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp193_ = _tmp192_->orientation; -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp194_ = params; -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp195_ = _tmp194_->row; -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp196_ = _tmp195_->master; -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp197_ = _tmp196_->dim; -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_cache_generate_for_photo (_tmp189_, _tmp190_, _tmp193_, &_tmp197_, &_inner_error_); -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10134 "Photo.c" - goto __catch302_g_error; +#line 10259 "Photo.c" + goto __catch314_g_error; } } - goto __finally302; - __catch302_g_error: + goto __finally314; + __catch314_g_error: { GError* err = NULL; GError* _tmp198_; ImportResult _tmp199_; -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _tmp198_ = err; -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _tmp199_ = import_result_convert_error (_tmp198_, IMPORT_RESULT_FILE_ERROR); -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp199_; -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10172 "Photo.c" +#line 10297 "Photo.c" } - __finally302: -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" + __finally314: +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.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 1263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 10197 "Photo.c" +#line 10322 "Photo.c" } -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 10201 "Photo.c" +#line 10326 "Photo.c" } -#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_SUCCESS; -#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10219 "Photo.c" +#line 10344 "Photo.c" } @@ -10282,305 +10407,305 @@ void photo_create_pre_import (PhotoImportParams* params) { PhotoFileSnifferOptions _tmp55_; PhotoFileInterrogator* _tmp56_; GError * _inner_error_ = NULL; -#line 1277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO_IMPORT_PARAMS (params)); -#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = params; -#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_->file; -#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp2_; -#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = params; -#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->row; -#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" photo_id_init (&_tmp4_->photo_id, PHOTO_ID_INVALID); -#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = params; -#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->row; -#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->master; -#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_file_get_path (file); -#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp7_->filepath); -#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_->filepath = _tmp8_; -#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = params; -#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->row; -#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_->master; -#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&_tmp11_->dim, 0, 0); -#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = params; -#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_->row; -#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->master; -#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->filesize = (gint64) 0; -#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = params; -#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_->row; -#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_->master; -#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_->timestamp = (time_t) 0; -#line 1284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = params; -#line 1284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->row; -#line 1284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_->exposure_time = (time_t) 0; -#line 1285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = params; -#line 1285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_->row; -#line 1285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_->orientation = ORIENTATION_TOP_LEFT; -#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = params; -#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_->row; -#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_->master; -#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_->original_orientation = ORIENTATION_TOP_LEFT; -#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = params; -#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_->row; -#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = params; -#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_->import_id; -#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_->import_id = _tmp28_; -#line 1288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = params; -#line 1288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_->row; -#line 1288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" event_id_init (&_tmp30_->event_id, EVENT_ID_INVALID); -#line 1289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = params; -#line 1289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_->row; -#line 1289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1308 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp32_->transformations); -#line 1289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_->transformations = NULL; -#line 1290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = params; -#line 1290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_->row; -#line 1290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1309 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp34_->md5); -#line 1290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_->md5 = NULL; -#line 1291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = params; -#line 1291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = _tmp35_->row; -#line 1291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1310 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp36_->thumbnail_md5); -#line 1291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_->thumbnail_md5 = NULL; -#line 1292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = params; -#line 1292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp37_->row; -#line 1292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1311 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp38_->exif_md5); -#line 1292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_->exif_md5 = NULL; -#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = params; -#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = _tmp39_->row; -#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_->time_created = (time_t) 0; -#line 1294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = params; -#line 1294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_->row; -#line 1294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_->flags = (guint64) 0; -#line 1295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1314 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = params; -#line 1295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1314 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp43_->row; -#line 1295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1314 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp44_->master; -#line 1295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1314 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_->file_format = PHOTO_FILE_FORMAT_JFIF; -#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = params; -#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _tmp46_->row; -#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1315 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp47_->title); -#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_->title = NULL; -#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = params; -#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = _tmp48_->row; -#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp49_->comment); -#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_->comment = NULL; -#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = params; -#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = _tmp50_->row; -#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_->rating = RATING_UNRATED; -#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = params; -#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp52_->file; -#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = params; -#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _tmp54_->sniffer_options; -#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = photo_file_interrogator_new (_tmp53_, _tmp55_); -#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" interrogator = _tmp56_; -#line 10458 "Photo.c" +#line 10583 "Photo.c" { DetectedPhotoInformation* detected = NULL; DetectedPhotoInformation* _tmp57_; gboolean _tmp58_ = FALSE; gboolean _tmp59_ = FALSE; DetectedPhotoInformation* _tmp60_; -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1321 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (interrogator, &_inner_error_); -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1321 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10469 "Photo.c" - goto __catch303_g_error; +#line 10594 "Photo.c" + goto __catch315_g_error; } -#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = photo_file_interrogator_get_detected_photo_information (interrogator); -#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp57_; -#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = detected; -#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1323 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp60_ != NULL) { -#line 10480 "Photo.c" +#line 10605 "Photo.c" gboolean _tmp61_; -#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = photo_file_interrogator_get_is_photo_corrupted (interrogator); -#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = !_tmp61_; -#line 10486 "Photo.c" +#line 10611 "Photo.c" } else { -#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = FALSE; -#line 10490 "Photo.c" +#line 10615 "Photo.c" } -#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1323 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp59_) { -#line 10494 "Photo.c" +#line 10619 "Photo.c" DetectedPhotoInformation* _tmp62_; PhotoFileFormat _tmp63_; -#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = detected; -#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = _tmp62_->file_format; -#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = _tmp63_ != PHOTO_FILE_FORMAT_UNKNOWN; -#line 10503 "Photo.c" +#line 10628 "Photo.c" } else { -#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = FALSE; -#line 10507 "Photo.c" +#line 10632 "Photo.c" } -#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1323 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp58_) { -#line 10511 "Photo.c" +#line 10636 "Photo.c" PhotoImportParams* _tmp64_; PhotoRow* _tmp65_; BackingPhotoRow* _tmp66_; DetectedPhotoInformation* _tmp67_; PhotoFileFormat _tmp68_; -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = params; -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = _tmp64_->row; -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = _tmp65_->master; -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = detected; -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = _tmp67_->file_format; -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_->file_format = _tmp68_; -#line 10529 "Photo.c" +#line 10654 "Photo.c" } -#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 10533 "Photo.c" +#line 10658 "Photo.c" } - goto __finally303; - __catch303_g_error: + goto __finally315; + __catch315_g_error: { GError* err = NULL; gchar* _tmp69_; gchar* _tmp70_; GError* _tmp71_; const gchar* _tmp72_; -#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = g_file_get_path (file); -#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = _tmp69_; -#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = err; -#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = _tmp71_->message; -#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:1307: Unable to interrogate photo file %s: %s", _tmp70_, _tmp72_); -#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1326 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:1326: Unable to interrogate photo file %s: %s", _tmp70_, _tmp72_); +#line 1326 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp70_); -#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 10561 "Photo.c" +#line 10686 "Photo.c" } - __finally303: -#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" + __finally315: +#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1320 "/home/jens/Source/shotwell/src/Photo.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 1301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 10576 "Photo.c" +#line 10701 "Photo.c" } -#line 1277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 10582 "Photo.c" +#line 10707 "Photo.c" } @@ -10622,51 +10747,51 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF PhotoMetadata* _tmp41_; BackingPhotoRow* _tmp45_; GError * _inner_error_ = NULL; -#line 1311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 1311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 1313 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 1313 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" _vala_detected = NULL; -#line 1315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing_photo_row_new (); -#line 1315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp0_; -#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1336 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 10638 "Photo.c" +#line 10763 "Photo.c" { GFileInfo* _tmp1_ = NULL; GFile* _tmp2_; GFileInfo* _tmp3_; GFileInfo* _tmp4_; -#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = file; -#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = g_file_query_info (_tmp2_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); -#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp3_; -#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10652 "Photo.c" - goto __catch304_g_error; +#line 10777 "Photo.c" + goto __catch316_g_error; } -#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp1_; -#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" info = _tmp4_; -#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 10665 "Photo.c" +#line 10790 "Photo.c" } - goto __finally304; - __catch304_g_error: + goto __finally316; + __catch316_g_error: { GError* err = NULL; GFile* _tmp5_; @@ -10674,350 +10799,350 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF gchar* _tmp7_; GError* _tmp8_; const gchar* _tmp9_; -#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = file; -#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = g_file_get_path (_tmp5_); -#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = err; -#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_->message; -#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" - g_critical ("Photo.vala:1322: Unable to read file information for %s: %s", _tmp7_, _tmp9_); -#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" + g_critical ("Photo.vala:1341: Unable to read file information for %s: %s", _tmp7_, _tmp9_); +#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp7_); -#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { -#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 10706 "Photo.c" +#line 10831 "Photo.c" } else { -#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 10710 "Photo.c" +#line 10835 "Photo.c" } -#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10714 "Photo.c" +#line 10839 "Photo.c" } - __finally304: -#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" + __finally316: +#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 10727 "Photo.c" +#line 10852 "Photo.c" } -#line 1328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = file; -#line 1328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = options; -#line 1328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_file_interrogator_new (_tmp10_, _tmp11_); -#line 1328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" interrogator = _tmp12_; -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = interrogator; -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (_tmp13_, &_inner_error_); -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 10753 "Photo.c" +#line 10878 "Photo.c" } -#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1349 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = interrogator; -#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1349 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_file_interrogator_get_detected_photo_information (_tmp14_); -#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1349 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1349 "/home/jens/Source/shotwell/src/Photo.vala" _vala_detected = _tmp15_; -#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _vala_detected; -#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_ == NULL) { -#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = TRUE; -#line 10769 "Photo.c" +#line 10894 "Photo.c" } else { PhotoFileInterrogator* _tmp18_; gboolean _tmp19_; -#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = interrogator; -#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = photo_file_interrogator_get_is_photo_corrupted (_tmp18_); -#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp19_; -#line 10779 "Photo.c" +#line 10904 "Photo.c" } -#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_) { -#line 10783 "Photo.c" +#line 10908 "Photo.c" gchar* _tmp20_; gchar* _tmp21_; -#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1351 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1351 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_; -#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" - g_critical ("Photo.vala:1332: Photo update: %s no longer a recognized image", _tmp21_); -#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1351 "/home/jens/Source/shotwell/src/Photo.vala" + g_critical ("Photo.vala:1351: Photo update: %s no longer a recognized image", _tmp21_); +#line 1351 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp21_); -#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { -#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 10806 "Photo.c" +#line 10931 "Photo.c" } else { -#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 10810 "Photo.c" +#line 10935 "Photo.c" } -#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10814 "Photo.c" +#line 10939 "Photo.c" } -#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1356 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = info; -#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1356 "/home/jens/Source/shotwell/src/Photo.vala" g_file_info_get_modification_time (_tmp22_, &_tmp23_); -#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1356 "/home/jens/Source/shotwell/src/Photo.vala" modification_time = _tmp23_; -#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1358 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = backing; -#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1358 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = file; -#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1358 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = g_file_get_path (_tmp25_); -#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1358 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp24_->filepath); -#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1358 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_->filepath = _tmp26_; -#line 1340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = backing; -#line 1340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = modification_time; -#line 1340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp28_.tv_sec; -#line 1340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_->timestamp = (time_t) _tmp29_; -#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = backing; -#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = info; -#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = g_file_info_get_size (_tmp31_); -#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_->filesize = _tmp32_; -#line 1342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1361 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = backing; -#line 1342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1361 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _vala_detected; -#line 1342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1361 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_->file_format; -#line 1342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1361 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_->file_format = _tmp35_; -#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = backing; -#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _vala_detected; -#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp37_->image_dim; -#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_->dim = _tmp38_; -#line 1344 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = _vala_detected; -#line 1344 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_->metadata; -#line 1344 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1363 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_ != NULL) { -#line 10870 "Photo.c" +#line 10995 "Photo.c" DetectedPhotoInformation* _tmp42_; PhotoMetadata* _tmp43_; Orientation _tmp44_; -#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _vala_detected; -#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp42_->metadata; -#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = photo_metadata_get_orientation (_tmp43_); -#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp44_; -#line 10882 "Photo.c" +#line 11007 "Photo.c" } else { -#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = ORIENTATION_TOP_LEFT; -#line 10886 "Photo.c" +#line 11011 "Photo.c" } -#line 1344 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = backing; -#line 1344 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_->original_orientation = _tmp39_; -#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" result = backing; -#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { -#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 10902 "Photo.c" +#line 11027 "Photo.c" } else { -#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 10906 "Photo.c" +#line 11031 "Photo.c" } -#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10910 "Photo.c" +#line 11035 "Photo.c" } -static void _vala_array_add88 (gchar** * array, int* length, int* size, gchar* value) { -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value) { +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10921 "Photo.c" +#line 11046 "Photo.c" } -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10927 "Photo.c" +#line 11052 "Photo.c" } -static void _vala_array_add89 (gchar** * array, int* length, int* size, gchar* value) { -#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value) { +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10938 "Photo.c" +#line 11063 "Photo.c" } -#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10944 "Photo.c" +#line 11069 "Photo.c" } -static void _vala_array_add90 (gchar** * array, int* length, int* size, gchar* value) { -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value) { +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10955 "Photo.c" +#line 11080 "Photo.c" } -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10961 "Photo.c" +#line 11086 "Photo.c" } -static void _vala_array_add91 (gchar** * array, int* length, int* size, gchar* value) { -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value) { +#line 1475 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1475 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1475 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10972 "Photo.c" +#line 11097 "Photo.c" } -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1475 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1475 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10978 "Photo.c" +#line 11103 "Photo.c" } -static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value) { -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value) { +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10989 "Photo.c" +#line 11114 "Photo.c" } -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10995 "Photo.c" +#line 11120 "Photo.c" } -static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value) { -#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value) { +#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11006 "Photo.c" +#line 11131 "Photo.c" } -#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11012 "Photo.c" +#line 11137 "Photo.c" } static gpointer _media_metadata_ref0 (gpointer self) { -#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1491 "/home/jens/Source/shotwell/src/Photo.vala" return self ? media_metadata_ref (self) : NULL; -#line 11019 "Photo.c" +#line 11144 "Photo.c" } @@ -11080,260 +11205,260 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat gint _tmp126__length1; PhotoReimportMasterStateImpl* _tmp127_; GError * _inner_error_ = NULL; -#line 1411 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 1412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1431 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 1412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1431 "/home/jens/Source/shotwell/src/Photo.vala" _vala_reimport_state = NULL; -#line 1414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_master_reader (self); -#line 1414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp1_); -#line 1414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp3_; -#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = file; -#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_query_backing_photo_row (self, _tmp4_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL, &_tmp5_, &_inner_error_); -#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp5_; -#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp6_; -#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11112 "Photo.c" +#line 11237 "Photo.c" gboolean _tmp7_ = FALSE; -#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp7_; -#line 11122 "Photo.c" +#line 11247 "Photo.c" } -#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = backing; -#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1438 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ == NULL) { -#line 11128 "Photo.c" +#line 11253 "Photo.c" GFile* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; -#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1439 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = file; -#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1439 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = g_file_get_path (_tmp9_); -#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1439 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1420: Unable to retrieve photo state from %s for reimport", _tmp11_); -#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1439 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:1439: Unable to retrieve photo state from %s for reimport", _tmp11_); +#line 1439 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp11_); -#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" if (reimport_state) { -#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11154 "Photo.c" +#line 11279 "Photo.c" } else { -#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11158 "Photo.c" +#line 11283 "Photo.c" } -#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11162 "Photo.c" +#line 11287 "Photo.c" } -#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = detected; -#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->colorspace; -#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_ != GDK_COLORSPACE_RGB) { -#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = TRUE; -#line 11172 "Photo.c" +#line 11297 "Photo.c" } else { DetectedPhotoInformation* _tmp16_; gint _tmp17_; -#line 1426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = detected; -#line 1426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_->channels; -#line 1426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp17_ < 3; -#line 11182 "Photo.c" +#line 11307 "Photo.c" } -#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = TRUE; -#line 11188 "Photo.c" +#line 11313 "Photo.c" } else { DetectedPhotoInformation* _tmp18_; gint _tmp19_; -#line 1427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = detected; -#line 1427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->bits_per_channel; -#line 1427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp19_ != 8; -#line 11198 "Photo.c" +#line 11323 "Photo.c" } -#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 11202 "Photo.c" +#line 11327 "Photo.c" GFile* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; -#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = file; -#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = g_file_get_path (_tmp20_); -#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_; -#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1428: Not re-importing %s: Unsupported color format", _tmp22_); -#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:1447: Not re-importing %s: Unsupported color format", _tmp22_); +#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp22_); -#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1449 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1449 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1449 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1449 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1449 "/home/jens/Source/shotwell/src/Photo.vala" if (reimport_state) { -#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1449 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11228 "Photo.c" +#line 11353 "Photo.c" } else { -#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1449 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11232 "Photo.c" +#line 11357 "Photo.c" } -#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1449 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11236 "Photo.c" +#line 11361 "Photo.c" } -#line 1434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo_row_new (); -#line 1434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" updated_row = _tmp23_; -#line 11242 "Photo.c" +#line 11367 "Photo.c" { PhotoRow* _tmp24_; -#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = self->row; -#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 11249 "Photo.c" +#line 11374 "Photo.c" { PhotoRow* _tmp25_; PhotoRow* _tmp26_; -#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->row; -#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _photo_row_ref0 (_tmp25_); -#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (updated_row); -#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" updated_row = _tmp26_; -#line 11261 "Photo.c" +#line 11386 "Photo.c" } - __finally305: + __finally317: { PhotoRow* _tmp27_; -#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = self->row; -#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 11270 "Photo.c" +#line 11395 "Photo.c" } -#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11274 "Photo.c" +#line 11399 "Photo.c" gboolean _tmp28_ = FALSE; -#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (updated_row); -#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp28_; -#line 11288 "Photo.c" +#line 11413 "Photo.c" } } -#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = g_new0 (gchar*, 0 + 1); -#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" list = _tmp29_; -#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" list_length1 = 0; -#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" _list_size_ = list_length1; -#line 1442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = updated_row; -#line 1442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_->md5; -#line 1442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = detected; -#line 1442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_->md5; -#line 1442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" if (g_strcmp0 (_tmp31_, _tmp33_) != 0) { -#line 11309 "Photo.c" +#line 11434 "Photo.c" gchar** _tmp34_; gint _tmp34__length1; gchar* _tmp35_; -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = list; -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34__length1 = list_length1; -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = g_strdup ("metadata:md5"); -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add88 (&list, &list_length1, &_list_size_, _tmp35_); -#line 11321 "Photo.c" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add92 (&list, &list_length1, &_list_size_, _tmp35_); +#line 11446 "Photo.c" } -#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = updated_row; -#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_->master; -#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp37_->original_orientation; -#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = backing; -#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = _tmp39_->original_orientation; -#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1464 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp38_ != _tmp40_) { -#line 11335 "Photo.c" +#line 11460 "Photo.c" gchar** _tmp41_; gint _tmp41__length1; gchar* _tmp42_; @@ -11341,33 +11466,33 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat BackingPhotoRow* _tmp44_; BackingPhotoRow* _tmp45_; Orientation _tmp46_; -#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = list; -#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41__length1 = list_length1; -#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = g_strdup ("image:orientation"); -#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add89 (&list, &list_length1, &_list_size_, _tmp42_); -#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add93 (&list, &list_length1, &_list_size_, _tmp42_); +#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = updated_row; -#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp43_->master; -#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = backing; -#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = _tmp45_->original_orientation; -#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_->original_orientation = _tmp46_; -#line 11361 "Photo.c" +#line 11486 "Photo.c" } -#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1469 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = detected; -#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1469 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_->metadata; -#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1469 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp48_ != NULL) { -#line 11369 "Photo.c" +#line 11494 "Photo.c" MetadataDateTime* date_time = NULL; DetectedPhotoInformation* _tmp49_; PhotoMetadata* _tmp50_; @@ -11393,204 +11518,204 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat DetectedPhotoInformation* _tmp80_; PhotoMetadata* _tmp81_; Rating _tmp82_; -#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = detected; -#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = _tmp49_->metadata; -#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = photo_metadata_get_exposure_date_time (_tmp50_); -#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1470 "/home/jens/Source/shotwell/src/Photo.vala" date_time = _tmp51_; -#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = date_time; -#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp53_ != NULL) { -#line 11407 "Photo.c" +#line 11532 "Photo.c" PhotoRow* _tmp54_; time_t _tmp55_; MetadataDateTime* _tmp56_; time_t _tmp57_; -#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = updated_row; -#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _tmp54_->exposure_time; -#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = date_time; -#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = metadata_date_time_get_timestamp (_tmp56_); -#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = _tmp55_ != _tmp57_; -#line 11422 "Photo.c" +#line 11547 "Photo.c" } else { -#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = FALSE; -#line 11426 "Photo.c" +#line 11551 "Photo.c" } -#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp52_) { -#line 11430 "Photo.c" +#line 11555 "Photo.c" gchar** _tmp58_; gint _tmp58__length1; gchar* _tmp59_; -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = list; -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58__length1 = list_length1; -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = g_strdup ("metadata:exposure-time"); -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add90 (&list, &list_length1, &_list_size_, _tmp59_); -#line 11442 "Photo.c" +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add94 (&list, &list_length1, &_list_size_, _tmp59_); +#line 11567 "Photo.c" } -#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = updated_row; -#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _tmp60_->title; -#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = detected; -#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = _tmp62_->metadata; -#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = _tmp64_; -#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = g_strcmp0 (_tmp61_, _tmp65_) != 0; -#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp65_); -#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp66_) { -#line 11462 "Photo.c" +#line 11587 "Photo.c" gchar** _tmp67_; gint _tmp67__length1; gchar* _tmp68_; -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = list; -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67__length1 = list_length1; -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = g_strdup ("metadata:name"); -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add91 (&list, &list_length1, &_list_size_, _tmp68_); -#line 11474 "Photo.c" +#line 1475 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add95 (&list, &list_length1, &_list_size_, _tmp68_); +#line 11599 "Photo.c" } -#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = updated_row; -#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = _tmp69_->comment; -#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = detected; -#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = _tmp71_->metadata; -#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = _tmp73_; -#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = g_strcmp0 (_tmp70_, _tmp74_) != 0; -#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp74_); -#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp75_) { -#line 11494 "Photo.c" +#line 11619 "Photo.c" gchar** _tmp76_; gint _tmp76__length1; gchar* _tmp77_; -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = list; -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76__length1 = list_length1; -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = g_strdup ("metadata:comment"); -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add92 (&list, &list_length1, &_list_size_, _tmp77_); -#line 11506 "Photo.c" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add96 (&list, &list_length1, &_list_size_, _tmp77_); +#line 11631 "Photo.c" } -#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = updated_row; -#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = _tmp78_->rating; -#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = detected; -#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = _tmp80_->metadata; -#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = photo_metadata_get_rating (_tmp81_); -#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp79_ != _tmp82_) { -#line 11520 "Photo.c" +#line 11645 "Photo.c" gchar** _tmp83_; gint _tmp83__length1; gchar* _tmp84_; -#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = list; -#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83__length1 = list_length1; -#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = g_strdup ("metadata:rating"); -#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add93 (&list, &list_length1, &_list_size_, _tmp84_); -#line 11532 "Photo.c" +#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add97 (&list, &list_length1, &_list_size_, _tmp84_); +#line 11657 "Photo.c" } -#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1469 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 11536 "Photo.c" +#line 11661 "Photo.c" } -#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1484 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = updated_row; -#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1484 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = backing; -#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1484 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = _backing_photo_row_ref0 (_tmp86_); -#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1484 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp85_->master); -#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1484 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_->master = _tmp87_; -#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = updated_row; -#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = detected; -#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tmp89_->md5; -#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = g_strdup (_tmp90_); -#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp88_->md5); -#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_->md5 = _tmp91_; -#line 1467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1486 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = updated_row; -#line 1467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1486 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = detected; -#line 1467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1486 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = _tmp93_->exif_md5; -#line 1467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1486 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = g_strdup (_tmp94_); -#line 1467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1486 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp92_->exif_md5); -#line 1467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1486 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_->exif_md5 = _tmp95_; -#line 1468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = updated_row; -#line 1468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = detected; -#line 1468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = _tmp97_->thumbnail_md5; -#line 1468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = g_strdup (_tmp98_); -#line 1468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1487 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp96_->thumbnail_md5); -#line 1468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_->thumbnail_md5 = _tmp99_; -#line 1470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1489 "/home/jens/Source/shotwell/src/Photo.vala" metadata = NULL; -#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1490 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = detected; -#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1490 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = _tmp100_->metadata; -#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1490 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp101_ != NULL) { -#line 11592 "Photo.c" +#line 11717 "Photo.c" DetectedPhotoInformation* _tmp102_; PhotoMetadata* _tmp103_; PhotoMetadata* _tmp104_; @@ -11611,180 +11736,180 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat DetectedPhotoInformation* _tmp121_; PhotoMetadata* _tmp122_; Rating _tmp123_; -#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1491 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = detected; -#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1491 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = _tmp102_->metadata; -#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1491 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = _media_metadata_ref0 (_tmp103_); -#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1491 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1491 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp104_; -#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1493 "/home/jens/Source/shotwell/src/Photo.vala" _tmp105_ = detected; -#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1493 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = _tmp105_->metadata; -#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1493 "/home/jens/Source/shotwell/src/Photo.vala" _tmp107_ = photo_metadata_get_exposure_date_time (_tmp106_); -#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1493 "/home/jens/Source/shotwell/src/Photo.vala" date_time = _tmp107_; -#line 1475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = date_time; -#line 1475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp108_ != NULL) { -#line 11635 "Photo.c" +#line 11760 "Photo.c" PhotoRow* _tmp109_; MetadataDateTime* _tmp110_; time_t _tmp111_; -#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1495 "/home/jens/Source/shotwell/src/Photo.vala" _tmp109_ = updated_row; -#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1495 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110_ = date_time; -#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1495 "/home/jens/Source/shotwell/src/Photo.vala" _tmp111_ = metadata_date_time_get_timestamp (_tmp110_); -#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1495 "/home/jens/Source/shotwell/src/Photo.vala" _tmp109_->exposure_time = _tmp111_; -#line 11647 "Photo.c" +#line 11772 "Photo.c" } -#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1497 "/home/jens/Source/shotwell/src/Photo.vala" _tmp112_ = updated_row; -#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1497 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = detected; -#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1497 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_ = _tmp113_->metadata; -#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1497 "/home/jens/Source/shotwell/src/Photo.vala" _tmp115_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1497 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp112_->title); -#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1497 "/home/jens/Source/shotwell/src/Photo.vala" _tmp112_->title = _tmp115_; -#line 1479 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp116_ = updated_row; -#line 1479 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp117_ = detected; -#line 1479 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp118_ = _tmp117_->metadata; -#line 1479 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp119_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1479 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp116_->comment); -#line 1479 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp116_->comment = _tmp119_; -#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" _tmp120_ = updated_row; -#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = detected; -#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" _tmp122_ = _tmp121_->metadata; -#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = photo_metadata_get_rating (_tmp122_); -#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" _tmp120_->rating = _tmp123_; -#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1490 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 11685 "Photo.c" +#line 11810 "Photo.c" } -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124_ = updated_row; -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp125_ = metadata; -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp126_ = list; -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp126__length1 = list_length1; -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp127_ = photo_reimport_master_state_impl_new (_tmp124_, _tmp125_, _tmp126_, _tmp126__length1); -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1502 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1502 "/home/jens/Source/shotwell/src/Photo.vala" _vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); -#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1504 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1504 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1504 "/home/jens/Source/shotwell/src/Photo.vala" list = (_vala_array_free (list, list_length1, (GDestroyNotify) g_free), NULL); -#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1504 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (updated_row); -#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1504 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1504 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1504 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1504 "/home/jens/Source/shotwell/src/Photo.vala" if (reimport_state) { -#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1504 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11719 "Photo.c" +#line 11844 "Photo.c" } else { -#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1504 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11723 "Photo.c" +#line 11848 "Photo.c" } -#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1504 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11727 "Photo.c" +#line 11852 "Photo.c" } static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) { -#line 1488 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1507 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("Type `%s' does not implement abstract method `photo_apply_user_metadata_for_reimport'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 1488 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1507 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11736 "Photo.c" +#line 11861 "Photo.c" } void photo_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) { -#line 1488 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1507 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1488 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1507 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->apply_user_metadata_for_reimport (self, metadata); -#line 11745 "Photo.c" +#line 11870 "Photo.c" } static gpointer _photo_reimport_master_state_ref0 (gpointer self) { -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1511 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_master_state_ref (self) : NULL; -#line 11752 "Photo.c" +#line 11877 "Photo.c" } -static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value) { -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value) { +#line 1529 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1529 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1529 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11763 "Photo.c" +#line 11888 "Photo.c" } -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1529 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1529 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11769 "Photo.c" +#line 11894 "Photo.c" } -static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value) { -#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value) { +#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11780 "Photo.c" +#line 11905 "Photo.c" } -#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11786 "Photo.c" +#line 11911 "Photo.c" } @@ -11803,56 +11928,56 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, gboolean _tmp33_; gboolean _tmp35_; GError * _inner_error_ = NULL; -#line 1491 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1491 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state)); -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1511 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = state; -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1511 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _photo_reimport_master_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)); -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1511 "/home/jens/Source/shotwell/src/Photo.vala" reimport_state = _tmp1_; -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_table_get_instance (); -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = reimport_state->row; -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_reimport (_tmp3_, _tmp4_, &_inner_error_); -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp3_); -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11835 "Photo.c" +#line 11960 "Photo.c" } else { -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.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 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11845 "Photo.c" +#line 11970 "Photo.c" } } { PhotoRow* _tmp5_; -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 11854 "Photo.c" +#line 11979 "Photo.c" { BackingPhotoRow* original_master = NULL; PhotoRow* _tmp6_; @@ -11868,191 +11993,191 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, PhotoRow* _tmp16_; BackingPhotoRow* _tmp17_; gboolean _tmp18_; -#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1517 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1517 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->master; -#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1517 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _backing_photo_row_ref0 (_tmp7_); -#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1517 "/home/jens/Source/shotwell/src/Photo.vala" original_master = _tmp8_; -#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1518 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = reimport_state->row; -#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1518 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _photo_row_ref0 (_tmp9_); -#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1518 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (self->row); -#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1518 "/home/jens/Source/shotwell/src/Photo.vala" self->row = _tmp10_; -#line 1500 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1519 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 1500 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1519 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = original_master; -#line 1500 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1519 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _backing_photo_row_ref0 (_tmp12_); -#line 1500 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1519 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp11_->master); -#line 1500 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1519 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_->master = _tmp13_; -#line 1501 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 1501 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->master; -#line 1501 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = reimport_state->row; -#line 1501 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_->master; -#line 1501 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1520 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_row_copy_from (_tmp15_, _tmp17_); -#line 1502 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1521 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = reimport_state->metadata_only; -#line 1502 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1521 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp18_) { -#line 1503 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1522 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 11912 "Photo.c" +#line 12037 "Photo.c" } -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (original_master); -#line 11916 "Photo.c" +#line 12041 "Photo.c" } - __finally306: + __finally318: { PhotoRow* _tmp19_; -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 11925 "Photo.c" +#line 12050 "Photo.c" } -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11937 "Photo.c" +#line 12062 "Photo.c" } else { -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.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 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11947 "Photo.c" +#line 12072 "Photo.c" } } } -#line 1506 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1525 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = reimport_state->metadata; -#line 1506 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1525 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp20_ != NULL) { -#line 11955 "Photo.c" +#line 12080 "Photo.c" PhotoMetadata* _tmp21_; -#line 1507 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1526 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = reimport_state->metadata; -#line 1507 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1526 "/home/jens/Source/shotwell/src/Photo.vala" photo_apply_user_metadata_for_reimport (self, _tmp21_); -#line 11961 "Photo.c" +#line 12086 "Photo.c" } -#line 1509 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = reimport_state->metadata_only; -#line 1509 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp22_) { -#line 11967 "Photo.c" +#line 12092 "Photo.c" gchar** _tmp23_; gint _tmp23__length1; gchar* _tmp24_; gboolean _tmp25_; -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1529 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = reimport_state->alterations; -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1529 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23__length1 = reimport_state->alterations_length1; -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1529 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = g_strdup ("image:master"); -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add94 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp24_); -#line 1511 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1529 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add98 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp24_); +#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = photo_is_master_baseline (self); -#line 1511 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp25_) { -#line 11984 "Photo.c" +#line 12109 "Photo.c" gchar** _tmp26_; gint _tmp26__length1; gchar* _tmp27_; -#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = reimport_state->alterations; -#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26__length1 = reimport_state->alterations_length1; -#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = g_strdup ("image:baseline"); -#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add95 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp27_); -#line 11996 "Photo.c" +#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add99 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp27_); +#line 12121 "Photo.c" } } -#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1534 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = reimport_state->alterations; -#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1534 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28__length1 = reimport_state->alterations_length1; -#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1534 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28__length1 > 0) { -#line 12005 "Photo.c" +#line 12130 "Photo.c" gchar** _tmp29_; gint _tmp29__length1; Alteration* _tmp30_; Alteration* _tmp31_; -#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1535 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = reimport_state->alterations; -#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1535 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29__length1 = reimport_state->alterations_length1; -#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1535 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = alteration_new_from_array (_tmp29_, _tmp29__length1); -#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1535 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_; -#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1535 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp31_); -#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1535 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp31_); -#line 12022 "Photo.c" +#line 12147 "Photo.c" } -#line 1518 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = reimport_state->metadata; -#line 1518 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_master_reimported (self, _tmp32_); -#line 1520 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1539 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = photo_is_master_baseline (self); -#line 1520 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1539 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp33_) { -#line 12032 "Photo.c" +#line 12157 "Photo.c" PhotoMetadata* _tmp34_; -#line 1521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = reimport_state->metadata; -#line 1521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_reimported (self, _tmp34_); -#line 12038 "Photo.c" +#line 12163 "Photo.c" } -#line 1523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_is_master_source (self); -#line 1523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp35_) { -#line 12044 "Photo.c" +#line 12169 "Photo.c" PhotoMetadata* _tmp36_; -#line 1524 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1543 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = reimport_state->metadata; -#line 1524 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1543 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_source_reimported (self, _tmp36_); -#line 12050 "Photo.c" +#line 12175 "Photo.c" } -#line 1491 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 12054 "Photo.c" +#line 12179 "Photo.c" } @@ -12071,177 +12196,177 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin DetectedPhotoInformation* _tmp9_; GdkColorspace _tmp10_; GError * _inner_error_ = NULL; -#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1547 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1547 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file; -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_query_backing_photo_row (self, _tmp1_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp2_, &_inner_error_); -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _vala_detected = _tmp2_; -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12089 "Photo.c" +#line 12214 "Photo.c" gboolean _tmp4_ = FALSE; -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp4_; -#line 12095 "Photo.c" +#line 12220 "Photo.c" } -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp0_; -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _vala_backing = _tmp5_; -#line 1532 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1551 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _vala_backing; -#line 1532 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1551 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ == NULL) { -#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp0_); -#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" if (backing) { -#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12117 "Photo.c" +#line 12242 "Photo.c" } else { -#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12121 "Photo.c" +#line 12246 "Photo.c" } -#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { -#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12127 "Photo.c" +#line 12252 "Photo.c" } else { -#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12131 "Photo.c" +#line 12256 "Photo.c" } -#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12135 "Photo.c" +#line 12260 "Photo.c" } -#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _vala_detected; -#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->colorspace; -#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_ != GDK_COLORSPACE_RGB) { -#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = TRUE; -#line 12145 "Photo.c" +#line 12270 "Photo.c" } else { DetectedPhotoInformation* _tmp11_; gint _tmp12_; -#line 1538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1557 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _vala_detected; -#line 1538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1557 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->channels; -#line 1538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1557 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp12_ < 3; -#line 12155 "Photo.c" +#line 12280 "Photo.c" } -#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = TRUE; -#line 12161 "Photo.c" +#line 12286 "Photo.c" } else { DetectedPhotoInformation* _tmp13_; gint _tmp14_; -#line 1539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _vala_detected; -#line 1539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->bits_per_channel; -#line 1539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp14_ != 8; -#line 12171 "Photo.c" +#line 12296 "Photo.c" } -#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { -#line 12175 "Photo.c" +#line 12300 "Photo.c" GFile* _tmp15_; gchar* _tmp16_; gchar* _tmp17_; -#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = file; -#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = g_file_get_path (_tmp15_); -#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1540: Not re-importing %s: Unsupported color format", _tmp17_); -#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:1559: Not re-importing %s: Unsupported color format", _tmp17_); +#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp17_); -#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp0_); -#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" if (backing) { -#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12197 "Photo.c" +#line 12322 "Photo.c" } else { -#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12201 "Photo.c" +#line 12326 "Photo.c" } -#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { -#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12207 "Photo.c" +#line 12332 "Photo.c" } else { -#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12211 "Photo.c" +#line 12336 "Photo.c" } -#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12215 "Photo.c" +#line 12340 "Photo.c" } -#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1564 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1564 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp0_); -#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1564 "/home/jens/Source/shotwell/src/Photo.vala" if (backing) { -#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1564 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12225 "Photo.c" +#line 12350 "Photo.c" } else { -#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1564 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12229 "Photo.c" +#line 12354 "Photo.c" } -#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1564 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { -#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1564 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12235 "Photo.c" +#line 12360 "Photo.c" } else { -#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1564 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12239 "Photo.c" +#line 12364 "Photo.c" } -#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1564 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12243 "Photo.c" +#line 12368 "Photo.c" } @@ -12263,132 +12388,132 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable PhotoMetadata* _tmp10_; PhotoReimportEditableStateImpl* _tmp11_; GError * _inner_error_ = NULL; -#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1568 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 1550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1569 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 1550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1569 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = NULL; -#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_editable_file (self); -#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1571 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp0_; -#line 1553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file; -#line 1553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1572 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 1554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 1554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12287 "Photo.c" +#line 12412 "Photo.c" } else { -#line 1554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12291 "Photo.c" +#line 12416 "Photo.c" } -#line 1554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12295 "Photo.c" +#line 12420 "Photo.c" } -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_verify_file_for_reimport (self, _tmp3_, &_tmp4_, &_tmp5_, &_inner_error_); -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp4_; -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp5_; -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp6_; -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12313 "Photo.c" +#line 12438 "Photo.c" gboolean _tmp7_ = FALSE; -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp7_; -#line 12325 "Photo.c" +#line 12450 "Photo.c" } -#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp2_) { -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12341 "Photo.c" +#line 12466 "Photo.c" } else { -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12345 "Photo.c" +#line 12470 "Photo.c" } -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12349 "Photo.c" +#line 12474 "Photo.c" } -#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = backing; -#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = detected; -#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->metadata; -#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_reimport_editable_state_impl_new (_tmp8_, _tmp10_); -#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1580 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1580 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState); -#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1582 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1582 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1582 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1582 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1582 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1582 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12375 "Photo.c" +#line 12500 "Photo.c" } else { -#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1582 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12379 "Photo.c" +#line 12504 "Photo.c" } -#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1582 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12383 "Photo.c" +#line 12508 "Photo.c" } static gpointer _photo_reimport_editable_state_ref0 (gpointer self) { -#line 1572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1591 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_editable_state_ref (self) : NULL; -#line 12390 "Photo.c" +#line 12515 "Photo.c" } @@ -12415,81 +12540,81 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st gboolean _tmp46_; gboolean _tmp49_; GError * _inner_error_ = NULL; -#line 1567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_EDITABLE_STATE (state)); -#line 1568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_editable_id (self, &_tmp0_); -#line 1568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" editable_id = _tmp0_; -#line 1569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = backing_photo_id_is_invalid (&editable_id); -#line 1569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 1570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1589 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12431 "Photo.c" +#line 12556 "Photo.c" } -#line 1572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = state; -#line 1572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _photo_reimport_editable_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)); -#line 1572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1591 "/home/jens/Source/shotwell/src/Photo.vala" reimport_state = _tmp3_; -#line 1574 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = reimport_state; -#line 1574 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->metadata_only; -#line 1574 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1593 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp5_) { -#line 12445 "Photo.c" +#line 12570 "Photo.c" BackingPhotoTable* _tmp6_; BackingPhotoTable* _tmp7_; PhotoReimportEditableStateImpl* _tmp8_; BackingPhotoRow* _tmp9_; -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = backing_photo_table_get_instance (); -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = reimport_state; -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_->backing_state; -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_update (_tmp7_, _tmp9_, &_inner_error_); -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp7_); -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12472 "Photo.c" +#line 12597 "Photo.c" } else { -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.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 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12482 "Photo.c" +#line 12607 "Photo.c" } } { PhotoRow* _tmp10_; -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1596 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->row; -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1596 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 12491 "Photo.c" +#line 12616 "Photo.c" { PhotoReimportEditableStateImpl* _tmp11_; BackingPhotoRow* _tmp12_; @@ -12497,58 +12622,58 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st PhotoReimportEditableStateImpl* _tmp14_; BackingPhotoRow* _tmp15_; Orientation _tmp16_; -#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = reimport_state; -#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->backing_state; -#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _backing_photo_row_ref0 (_tmp12_); -#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); -#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->editable = _tmp13_; -#line 1579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = reimport_state; -#line 1579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->backing_state; -#line 1579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_->original_orientation; -#line 1579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1598 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp16_); -#line 1580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1599 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 12519 "Photo.c" +#line 12644 "Photo.c" } - __finally307: + __finally319: { PhotoRow* _tmp17_; -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1596 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->row; -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1596 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 12528 "Photo.c" +#line 12653 "Photo.c" } -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1596 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1596 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1596 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1596 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1596 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12540 "Photo.c" +#line 12665 "Photo.c" } else { -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1596 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1596 "/home/jens/Source/shotwell/src/Photo.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 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1596 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1596 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12550 "Photo.c" +#line 12675 "Photo.c" } } } @@ -12556,23 +12681,23 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st PhotoReimportEditableStateImpl* _tmp18_; BackingPhotoRow* _tmp19_; Orientation _tmp20_; -#line 1583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1602 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = reimport_state; -#line 1583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1602 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->backing_state; -#line 1583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1602 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_->original_orientation; -#line 1583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1602 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp20_); -#line 12566 "Photo.c" +#line 12691 "Photo.c" } -#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = reimport_state; -#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_->metadata; -#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1605 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_ != NULL) { -#line 12574 "Photo.c" +#line 12699 "Photo.c" PhotoReimportEditableStateImpl* _tmp23_; PhotoMetadata* _tmp24_; gchar* _tmp25_; @@ -12586,127 +12711,127 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st Rating _tmp33_; PhotoReimportEditableStateImpl* _tmp34_; PhotoMetadata* _tmp35_; -#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1606 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = reimport_state; -#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1606 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_->metadata; -#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1606 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1606 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_; -#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1606 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp26_); -#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1606 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp26_); -#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = reimport_state; -#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_->metadata; -#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_; -#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1607 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp30_); -#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1607 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp30_); -#line 1589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1608 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = reimport_state; -#line 1589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1608 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_->metadata; -#line 1589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1608 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = photo_metadata_get_rating (_tmp32_); -#line 1589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1608 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp33_); -#line 1590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = reimport_state; -#line 1590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_->metadata; -#line 1590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1609 "/home/jens/Source/shotwell/src/Photo.vala" photo_apply_user_metadata_for_reimport (self, _tmp35_); -#line 12626 "Photo.c" +#line 12751 "Photo.c" } -#line 1593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); -#line 1593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1612 "/home/jens/Source/shotwell/src/Photo.vala" list = _tmp36_; -#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1613 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = reimport_state; -#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1613 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp37_->metadata_only; -#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1613 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp38_) { -#line 12638 "Photo.c" +#line 12763 "Photo.c" const gchar* _tmp39_; gchar* _tmp40_; -#line 1595 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = list; -#line 1595 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = g_strconcat (_tmp39_, "image:editable,image:baseline", NULL); -#line 1595 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); -#line 1595 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" list = _tmp40_; -#line 12649 "Photo.c" +#line 12774 "Photo.c" } -#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = list; -#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = alteration_new_from_list (_tmp41_); -#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp42_; -#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp43_); -#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp43_); -#line 1599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = reimport_state; -#line 1599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp44_->metadata; -#line 1599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_editable_reimported (self, _tmp45_); -#line 1601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = photo_is_editable_baseline (self); -#line 1601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1620 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp46_) { -#line 12671 "Photo.c" +#line 12796 "Photo.c" PhotoReimportEditableStateImpl* _tmp47_; PhotoMetadata* _tmp48_; -#line 1602 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = reimport_state; -#line 1602 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_->metadata; -#line 1602 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_reimported (self, _tmp48_); -#line 12680 "Photo.c" +#line 12805 "Photo.c" } -#line 1604 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1623 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = photo_is_editable_source (self); -#line 1604 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1623 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_) { -#line 12686 "Photo.c" +#line 12811 "Photo.c" PhotoReimportEditableStateImpl* _tmp50_; PhotoMetadata* _tmp51_; -#line 1605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = reimport_state; -#line 1605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = _tmp50_->metadata; -#line 1605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1624 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_source_reimported (self, _tmp51_); -#line 12695 "Photo.c" +#line 12820 "Photo.c" } -#line 1567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); -#line 1567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); -#line 12701 "Photo.c" +#line 12826 "Photo.c" } static gpointer _photo_reimport_raw_development_state_ref0 (gpointer self) { -#line 1627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_raw_development_state_ref (self) : NULL; -#line 12708 "Photo.c" +#line 12833 "Photo.c" } @@ -12723,56 +12848,56 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR PhotoReimportRawDevelopmentStateImpl* _tmp21_; gint _tmp22_; GError * _inner_error_ = NULL; -#line 1609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 1610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1629 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 1610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1629 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = NULL; -#line 1612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1631 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_raw_developer_files (self); -#line 1612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1631 "/home/jens/Source/shotwell/src/Photo.vala" files = _tmp0_; -#line 1613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1632 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = files; -#line 1613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1632 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1633 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1633 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (files); -#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1633 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1633 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12747 "Photo.c" +#line 12872 "Photo.c" } else { -#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1633 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 12751 "Photo.c" +#line 12876 "Photo.c" } -#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1633 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12755 "Photo.c" +#line 12880 "Photo.c" } -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_reimport_raw_development_state_impl_new (); -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1635 "/home/jens/Source/shotwell/src/Photo.vala" reimport_state = _tmp2_; -#line 12761 "Photo.c" +#line 12886 "Photo.c" { GeeIterator* _file_it = NULL; GeeCollection* _tmp3_; GeeIterator* _tmp4_; -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = files; -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _file_it = _tmp4_; -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 12774 "Photo.c" +#line 12899 "Photo.c" GeeIterator* _tmp5_; gboolean _tmp6_; GFile* file = NULL; @@ -12789,123 +12914,123 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR BackingPhotoRow* _tmp16_; DetectedPhotoInformation* _tmp17_; PhotoMetadata* _tmp18_; -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _file_it; -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_iterator_next (_tmp5_); -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp6_) { -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 12799 "Photo.c" +#line 12924 "Photo.c" } -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _file_it; -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = gee_iterator_get (_tmp7_); -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" file = (GFile*) _tmp8_; -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = file; -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_verify_file_for_reimport (self, _tmp10_, &_tmp11_, &_tmp12_, &_inner_error_); -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp11_; -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp12_; -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp13_; -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12823 "Photo.c" +#line 12948 "Photo.c" gboolean _tmp14_ = FALSE; -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_file_it); -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (files); -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp14_; -#line 12841 "Photo.c" +#line 12966 "Photo.c" } -#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp9_) { -#line 1622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1641 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1641 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1641 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1641 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 12853 "Photo.c" +#line 12978 "Photo.c" } -#line 1624 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = reimport_state; -#line 1624 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = backing; -#line 1624 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = detected; -#line 1624 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_->metadata; -#line 1624 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1643 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_add (_tmp15_, _tmp16_, _tmp18_); -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 12871 "Photo.c" +#line 12996 "Photo.c" } -#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_file_it); -#line 12875 "Photo.c" +#line 13000 "Photo.c" } -#line 1627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = reimport_state; -#line 1627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState)); -#line 1627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 1627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = _tmp20_; -#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = reimport_state; -#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = photo_reimport_raw_development_state_impl_get_size (_tmp21_); -#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp22_ > 0; -#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); -#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (files); -#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12899 "Photo.c" +#line 13024 "Photo.c" } else { -#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 12903 "Photo.c" +#line 13028 "Photo.c" } -#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12907 "Photo.c" +#line 13032 "Photo.c" } @@ -12922,41 +13047,41 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop Alteration* _tmp38_; Alteration* _tmp39_; GError * _inner_error_ = NULL; -#line 1632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1651 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1651 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE (state)); -#line 1633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1652 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_master_file_format (self); -#line 1633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1652 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { -#line 1634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1653 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12934 "Photo.c" +#line 13059 "Photo.c" } -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1655 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = state; -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1655 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl)); -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1655 "/home/jens/Source/shotwell/src/Photo.vala" reimport_state = _tmp2_; -#line 12942 "Photo.c" +#line 13067 "Photo.c" { GeeIterator* _dev_it = NULL; PhotoReimportRawDevelopmentStateImpl* _tmp3_; GeeCollection* _tmp4_; GeeIterator* _tmp5_; -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = reimport_state; -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->list; -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _dev_it = _tmp5_; -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 12958 "Photo.c" +#line 13083 "Photo.c" GeeIterator* _tmp6_; gboolean _tmp7_; PhotoReimportRawDevelopmentStateImplDevToReimport* dev = NULL; @@ -12964,105 +13089,105 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop gpointer _tmp9_; PhotoReimportRawDevelopmentStateImpl* _tmp10_; gboolean _tmp11_; -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _dev_it; -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp7_) { -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 12974 "Photo.c" +#line 13099 "Photo.c" } -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _dev_it; -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" dev = (PhotoReimportRawDevelopmentStateImplDevToReimport*) _tmp9_; -#line 1639 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = reimport_state; -#line 1639 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_->metadata_only; -#line 1639 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp11_) { -#line 12988 "Photo.c" +#line 13113 "Photo.c" BackingPhotoTable* _tmp12_; BackingPhotoTable* _tmp13_; PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_; BackingPhotoRow* _tmp15_; -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = backing_photo_table_get_instance (); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = dev; -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->backing; -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_update (_tmp13_, _tmp15_, &_inner_error_); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp13_); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_dev_it); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13019 "Photo.c" +#line 13144 "Photo.c" } else { -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_dev_it); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.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 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1659 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13033 "Photo.c" +#line 13158 "Photo.c" } } { PhotoRow* _tmp16_; -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->row; -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 13042 "Photo.c" +#line 13167 "Photo.c" { gint _tmp17_; RawDeveloper* _tmp18_; -#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1663 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = raw_developer_as_array (&_tmp17_); -#line 13048 "Photo.c" +#line 13173 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; gint _d_collection_size_ = 0; gint d_it = 0; -#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1663 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = _tmp18_; -#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1663 "/home/jens/Source/shotwell/src/Photo.vala" d_collection_length1 = _tmp17_; -#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1663 "/home/jens/Source/shotwell/src/Photo.vala" for (d_it = 0; d_it < _tmp17_; d_it = d_it + 1) { -#line 13060 "Photo.c" +#line 13185 "Photo.c" RawDeveloper d = 0; -#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1663 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 13064 "Photo.c" +#line 13189 "Photo.c" { BackingPhotoID id = {0}; PhotoRow* _tmp19_; @@ -13072,154 +13197,154 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop BackingPhotoID _tmp22_; BackingPhotoID _tmp23_; gint64 _tmp24_; -#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_->development_ids; -#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20__length1 = _tmp19_->development_ids_length1; -#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = d; -#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp20_[_tmp21_]; -#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1664 "/home/jens/Source/shotwell/src/Photo.vala" id = _tmp22_; -#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1665 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = id; -#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1665 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_.id; -#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1665 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_ != BACKING_PHOTO_ID_INVALID) { -#line 13092 "Photo.c" +#line 13217 "Photo.c" BackingPhotoRow* bpr = NULL; BackingPhotoID _tmp25_; BackingPhotoRow* _tmp26_; BackingPhotoRow* _tmp27_; -#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1666 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = id; -#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1666 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = photo_get_backing_row (self, &_tmp25_); -#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1666 "/home/jens/Source/shotwell/src/Photo.vala" bpr = _tmp26_; -#line 1648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = bpr; -#line 1648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1667 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp27_ != NULL) { -#line 13107 "Photo.c" +#line 13232 "Photo.c" GeeHashMap* _tmp28_; RawDeveloper _tmp29_; BackingPhotoRow* _tmp30_; -#line 1649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = self->priv->developments; -#line 1649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = d; -#line 1649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = bpr; -#line 1649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1668 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp29_), _tmp30_); -#line 13119 "Photo.c" +#line 13244 "Photo.c" } -#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1665 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 13123 "Photo.c" +#line 13248 "Photo.c" } } } -#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1663 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 13129 "Photo.c" +#line 13254 "Photo.c" } } - __finally308: + __finally320: { PhotoRow* _tmp31_; -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = self->row; -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13139 "Photo.c" +#line 13264 "Photo.c" } -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_dev_it); -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13155 "Photo.c" +#line 13280 "Photo.c" } else { -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_dev_it); -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.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 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1661 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13169 "Photo.c" +#line 13294 "Photo.c" } } } } -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); -#line 13176 "Photo.c" +#line 13301 "Photo.c" } -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_dev_it); -#line 13180 "Photo.c" +#line 13305 "Photo.c" } -#line 1656 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1675 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); -#line 1656 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1675 "/home/jens/Source/shotwell/src/Photo.vala" list = _tmp32_; -#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1676 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = reimport_state; -#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1676 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_->metadata_only; -#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1676 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp34_) { -#line 13192 "Photo.c" +#line 13317 "Photo.c" const gchar* _tmp35_; gchar* _tmp36_; -#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = list; -#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = g_strconcat (_tmp35_, "image:editable,image:baseline", NULL); -#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); -#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" list = _tmp36_; -#line 13203 "Photo.c" +#line 13328 "Photo.c" } -#line 1660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1679 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = list; -#line 1660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1679 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = alteration_new_from_list (_tmp37_); -#line 1660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1679 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp38_; -#line 1660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1679 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_); -#line 1660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1679 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp39_); -#line 1662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1681 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 1632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1651 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); -#line 1632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1651 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); -#line 13221 "Photo.c" +#line 13346 "Photo.c" } @@ -13227,15 +13352,15 @@ static gchar* photo_real_get_typename (DataSource* base) { Photo * self; gchar* result = NULL; gchar* _tmp0_; -#line 1665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = g_strdup (PHOTO_TYPENAME); -#line 1666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 1666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13237 "Photo.c" +#line 13362 "Photo.c" } @@ -13244,17 +13369,17 @@ static gint64 photo_real_get_instance_id (DataSource* base) { gint64 result = 0LL; PhotoID _tmp0_ = {0}; gint64 _tmp1_; -#line 1669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1688 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1670 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp0_); -#line 1670 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_.id; -#line 1670 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 1670 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13256 "Photo.c" +#line 13381 "Photo.c" } @@ -13266,25 +13391,25 @@ static gchar* photo_real_get_source_id (DataSource* base) { gint64 _tmp2_; gchar* _tmp3_; gchar* _tmp4_; -#line 1673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1692 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = data_source_get_typename (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource)); -#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource)); -#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = g_strdup_printf ("%s%016" G_GINT64_MODIFIER "x", _tmp1_, _tmp2_); -#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1696 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp1_); -#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1696 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1696 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13286 "Photo.c" +#line 13411 "Photo.c" } @@ -13294,25 +13419,25 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { GTimeVal _tmp1_ = {0}; gboolean _tmp21_; GError * _inner_error_ = NULL; -#line 1681 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1700 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1681 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1700 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 1682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1701 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = info; -#line 1682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1701 "/home/jens/Source/shotwell/src/Photo.vala" g_file_info_get_modification_time (_tmp0_, &_tmp1_); -#line 1682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1701 "/home/jens/Source/shotwell/src/Photo.vala" modification = _tmp1_; -#line 13306 "Photo.c" +#line 13431 "Photo.c" { { PhotoRow* _tmp2_; -#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 13314 "Photo.c" +#line 13439 "Photo.c" { PhotoRow* _tmp3_; BackingPhotoRow* _tmp4_; @@ -13329,148 +13454,148 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { BackingPhotoRow* _tmp16_; GTimeVal _tmp17_; glong _tmp18_; -#line 1686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 1686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->master; -#line 1686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->timestamp; -#line 1686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = modification; -#line 1686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_.tv_sec; -#line 1686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1705 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ == ((time_t) _tmp7_)) { -#line 13343 "Photo.c" +#line 13468 "Photo.c" { PhotoRow* _tmp8_; -#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; -#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13350 "Photo.c" +#line 13475 "Photo.c" } -#line 1687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1706 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13354 "Photo.c" +#line 13479 "Photo.c" } -#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_table_get_instance (); -#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_; -#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->photo_id; -#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = modification; -#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_.tv_sec; -#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_update_timestamp (_tmp10_, &_tmp12_, (time_t) _tmp14_, &_inner_error_); -#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp10_); -#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13374 "Photo.c" - goto __finally310; +#line 13499 "Photo.c" + goto __finally322; } -#line 1690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 1690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_->master; -#line 1690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = modification; -#line 1690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_.tv_sec; -#line 1690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_->timestamp = (time_t) _tmp18_; -#line 13387 "Photo.c" +#line 13512 "Photo.c" } - __finally310: + __finally322: { PhotoRow* _tmp19_; -#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13396 "Photo.c" +#line 13521 "Photo.c" } -#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 13402 "Photo.c" - goto __catch309_database_error; +#line 13527 "Photo.c" + goto __catch321_database_error; } -#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13411 "Photo.c" +#line 13536 "Photo.c" } } } - goto __finally309; - __catch309_database_error: + goto __finally321; + __catch321_database_error: { GError* err = NULL; GError* _tmp20_; -#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1703 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1703 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1693 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = err; -#line 1693 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1712 "/home/jens/Source/shotwell/src/Photo.vala" app_window_database_error (_tmp20_); -#line 1695 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1714 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 1695 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1714 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13432 "Photo.c" +#line 13557 "Photo.c" } - __finally309: -#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" + __finally321: +#line 1703 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1703 "/home/jens/Source/shotwell/src/Photo.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 1684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1703 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1703 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13443 "Photo.c" +#line 13568 "Photo.c" } -#line 1698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_is_master_baseline (self); -#line 1698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1717 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 13449 "Photo.c" +#line 13574 "Photo.c" Alteration* _tmp22_; Alteration* _tmp23_; -#line 1699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = alteration_new_from_list ("metadata:master-timestamp,metadata:baseline-timestamp"); -#line 1699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_; -#line 1699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1718 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_); -#line 1699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1718 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp23_); -#line 13460 "Photo.c" +#line 13585 "Photo.c" } else { Alteration* _tmp24_; Alteration* _tmp25_; -#line 1701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1720 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = alteration_new ("metadata", "master-timestamp"); -#line 1701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1720 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_; -#line 1701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1720 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); -#line 1701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1720 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp25_); -#line 13472 "Photo.c" +#line 13597 "Photo.c" } } @@ -13482,60 +13607,60 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr gboolean altered = FALSE; gboolean _tmp20_; GError * _inner_error_ = NULL; -#line 1705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 1706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = info; -#line 1706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" g_file_info_get_modification_time (_tmp0_, &_tmp1_); -#line 1706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" modification = _tmp1_; -#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" altered = FALSE; -#line 13496 "Photo.c" +#line 13621 "Photo.c" { PhotoRow* _tmp2_; -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 13503 "Photo.c" +#line 13628 "Photo.c" { gboolean _tmp3_ = FALSE; PhotoRow* _tmp4_; gboolean _tmp5_; -#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = backing_photo_id_is_valid (&_tmp4_->editable_id); -#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1729 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 13514 "Photo.c" +#line 13639 "Photo.c" BackingPhotoRow* _tmp6_; time_t _tmp7_; GTimeVal _tmp8_; glong _tmp9_; -#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->editable; -#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->timestamp; -#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = modification; -#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_.tv_sec; -#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp7_ != ((time_t) _tmp9_); -#line 13529 "Photo.c" +#line 13654 "Photo.c" } else { -#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = FALSE; -#line 13533 "Photo.c" +#line 13658 "Photo.c" } -#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1729 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_) { -#line 13537 "Photo.c" +#line 13662 "Photo.c" BackingPhotoTable* _tmp10_; BackingPhotoTable* _tmp11_; PhotoRow* _tmp12_; @@ -13545,96 +13670,96 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr BackingPhotoRow* _tmp16_; GTimeVal _tmp17_; glong _tmp18_; -#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = backing_photo_table_get_instance (); -#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->row; -#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_->editable_id; -#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = modification; -#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_.tv_sec; -#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_update_timestamp (_tmp11_, &_tmp13_, (time_t) _tmp15_, &_inner_error_); -#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp11_); -#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13565 "Photo.c" - goto __finally311; +#line 13690 "Photo.c" + goto __finally323; } -#line 1713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->editable; -#line 1713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = modification; -#line 1713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_.tv_sec; -#line 1713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_->timestamp = (time_t) _tmp18_; -#line 1714 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1733 "/home/jens/Source/shotwell/src/Photo.vala" altered = TRUE; -#line 13578 "Photo.c" +#line 13703 "Photo.c" } } - __finally311: + __finally323: { PhotoRow* _tmp19_; -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13588 "Photo.c" +#line 13713 "Photo.c" } -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13598 "Photo.c" +#line 13723 "Photo.c" } else { -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.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 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13606 "Photo.c" +#line 13731 "Photo.c" } } } -#line 1718 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = altered; -#line 1718 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp20_) { -#line 13614 "Photo.c" +#line 13739 "Photo.c" Alteration* _tmp21_; Alteration* _tmp22_; -#line 1719 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1738 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = alteration_new_from_list ("metadata:editable-timestamp,metadata:baseline-timestamp"); -#line 1719 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1738 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_; -#line 1719 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1738 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp22_); -#line 1719 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1738 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp22_); -#line 13625 "Photo.c" +#line 13750 "Photo.c" } } void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { GError * _inner_error_ = NULL; -#line 1723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1742 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1744 "/home/jens/Source/shotwell/src/Photo.vala" database_table_begin_transaction (); -#line 13636 "Photo.c" +#line 13761 "Photo.c" { GeeIterator* _photo_it = NULL; GeeMap* _tmp0_; @@ -13643,25 +13768,25 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { GeeSet* _tmp3_; GeeIterator* _tmp4_; GeeIterator* _tmp5_; -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = map; -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_map_get_keys (_tmp0_); -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _photo_it = _tmp5_; -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 13663 "Photo.c" +#line 13788 "Photo.c" GeeIterator* _tmp6_; gboolean _tmp7_; Photo* photo = NULL; @@ -13672,90 +13797,90 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { Photo* _tmp12_; gpointer _tmp13_; GFileInfo* _tmp14_; -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _photo_it; -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp7_) { -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 13682 "Photo.c" +#line 13807 "Photo.c" } -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _photo_it; -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" photo = (Photo*) _tmp9_; -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo; -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = map; -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo; -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = gee_map_get (_tmp11_, _tmp12_); -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = (GFileInfo*) _tmp13_; -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" photo_update_editable_modification_time (_tmp10_, _tmp14_, &_inner_error_); -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp14_); -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13716 "Photo.c" +#line 13841 "Photo.c" } else { -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.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 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13728 "Photo.c" +#line 13853 "Photo.c" } } -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 13733 "Photo.c" +#line 13858 "Photo.c" } -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 13737 "Photo.c" +#line 13862 "Photo.c" } -#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1747 "/home/jens/Source/shotwell/src/Photo.vala" database_table_commit_transaction (&_inner_error_); -#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1747 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1747 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1747 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1747 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13749 "Photo.c" +#line 13874 "Photo.c" } else { -#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1747 "/home/jens/Source/shotwell/src/Photo.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 1728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1747 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1747 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13757 "Photo.c" +#line 13882 "Photo.c" } } } @@ -13767,34 +13892,34 @@ static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSourc PhotoFileFormat _tmp0_ = 0; PhotoFileFormat _tmp1_; gboolean _tmp2_; -#line 1731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_file_format (self); -#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_format_can_write_image (_tmp1_); -#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 13777 "Photo.c" +#line 13902 "Photo.c" PhotoFileFormat _tmp3_; -#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_file_format (self); -#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 13783 "Photo.c" +#line 13908 "Photo.c" } else { PhotoFileFormat _tmp4_; -#line 1733 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1752 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_file_format_get_system_default_format (); -#line 1733 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1752 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp4_; -#line 13790 "Photo.c" +#line 13915 "Photo.c" } -#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13796 "Photo.c" +#line 13921 "Photo.c" } @@ -13807,35 +13932,35 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale GdkPixbuf* _tmp3_; GdkPixbuf* _tmp4_; GError * _inner_error_ = NULL; -#line 1736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1755 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = scale; -#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" scaling_for_best_fit (_tmp1_, TRUE, &_tmp2_); -#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp2_, &_inner_error_); -#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 13825 "Photo.c" +#line 13950 "Photo.c" } -#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp0_; -#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13837 "Photo.c" +#line 13962 "Photo.c" } @@ -13844,41 +13969,41 @@ gboolean photo_is_file_image (GFile* file) { gboolean _tmp0_ = FALSE; GFile* _tmp1_; gboolean _tmp2_; -#line 1740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1759 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 1744 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file; -#line 1744 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_format_is_file_supported (_tmp1_); -#line 1744 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1764 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 13856 "Photo.c" +#line 13981 "Photo.c" } else { GFile* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; gboolean _tmp6_; -#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1764 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; -#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1764 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = g_file_get_basename (_tmp3_); -#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1764 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1764 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_is_extension_found (_tmp5_, PHOTO_IMAGE_EXTENSIONS, G_N_ELEMENTS (PHOTO_IMAGE_EXTENSIONS)); -#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1764 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp6_; -#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1764 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp5_); -#line 13874 "Photo.c" +#line 13999 "Photo.c" } -#line 1744 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 1744 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13880 "Photo.c" +#line 14005 "Photo.c" } @@ -13894,102 +14019,102 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi gchar* _tmp5_; gchar** _tmp6_; gint _tmp6__length1; -#line 1748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1767 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (basename != NULL, FALSE); -#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1769 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = basename; -#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1769 "/home/jens/Source/shotwell/src/Photo.vala" disassemble_filename (_tmp0_, &_tmp1_, &_tmp2_); -#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1769 "/home/jens/Source/shotwell/src/Photo.vala" name = _tmp1_; -#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1769 "/home/jens/Source/shotwell/src/Photo.vala" ext = _tmp2_; -#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1770 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = ext; -#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1770 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ == NULL) { -#line 1752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1771 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1771 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 1752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1771 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 1752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1771 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13922 "Photo.c" +#line 14047 "Photo.c" } -#line 1755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1774 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = ext; -#line 1755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1774 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = g_utf8_strdown (_tmp4_, (gssize) -1); -#line 1755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1774 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 1755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1774 "/home/jens/Source/shotwell/src/Photo.vala" ext = _tmp5_; -#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = extensions; -#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6__length1 = extensions_length1; -#line 13936 "Photo.c" +#line 14061 "Photo.c" { gchar** extension_collection = NULL; gint extension_collection_length1 = 0; gint _extension_collection_size_ = 0; gint extension_it = 0; -#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1777 "/home/jens/Source/shotwell/src/Photo.vala" extension_collection = _tmp6_; -#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1777 "/home/jens/Source/shotwell/src/Photo.vala" extension_collection_length1 = _tmp6__length1; -#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1777 "/home/jens/Source/shotwell/src/Photo.vala" for (extension_it = 0; extension_it < _tmp6__length1; extension_it = extension_it + 1) { -#line 13948 "Photo.c" +#line 14073 "Photo.c" gchar* _tmp7_; gchar* extension = NULL; -#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = g_strdup (extension_collection[extension_it]); -#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1777 "/home/jens/Source/shotwell/src/Photo.vala" extension = _tmp7_; -#line 13955 "Photo.c" +#line 14080 "Photo.c" { const gchar* _tmp8_; const gchar* _tmp9_; -#line 1759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1778 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = ext; -#line 1759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1778 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = extension; -#line 1759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1778 "/home/jens/Source/shotwell/src/Photo.vala" if (g_strcmp0 (_tmp8_, _tmp9_) == 0) { -#line 1760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 1760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (extension); -#line 1760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 1760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 1760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13975 "Photo.c" +#line 14100 "Photo.c" } -#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1777 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (extension); -#line 13979 "Photo.c" +#line 14104 "Photo.c" } } } -#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1782 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1782 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1782 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1782 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13991 "Photo.c" +#line 14116 "Photo.c" } @@ -14003,31 +14128,31 @@ gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gcha PhotoFileFormat _tmp5_; gboolean _tmp6_; gboolean _tmp7_; -#line 1769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1788 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); -#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); -#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = file; -#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = thumbnail_md5; -#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = full_md5; -#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = file_format; -#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_table_has_duplicate (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); -#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp7_; -#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14029 "Photo.c" +#line 14154 "Photo.c" } @@ -14045,43 +14170,43 @@ PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const gint _tmp8__length1; PhotoID* _tmp9_; gint _tmp9__length1; -#line 1778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1797 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = file; -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = thumbnail_md5; -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = full_md5; -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = file_format; -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_table_get_duplicate_ids (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_); -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8__length1 = _tmp6_; -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9__length1 = _tmp8__length1; -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp9__length1; -#line 14077 "Photo.c" +#line 14202 "Photo.c" } -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp9_; -#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14083 "Photo.c" +#line 14208 "Photo.c" } @@ -14090,19 +14215,19 @@ gint64 photo_get_photo_key (DataSource* source) { DataSource* _tmp0_; PhotoID _tmp1_ = {0}; gint64 _tmp2_; -#line 1788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1807 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL); -#line 1789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = source; -#line 1789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_PHOTO, Photo), &_tmp1_); -#line 1789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_.id; -#line 1789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 1789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14104 "Photo.c" +#line 14229 "Photo.c" } @@ -14113,91 +14238,91 @@ static GFile* photo_real_get_file (MediaSource* base) { PhotoFileReader* _tmp1_; GFile* _tmp2_; GFile* _tmp3_; -#line 1807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1827 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_source_reader (self); -#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1827 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1827 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1827 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1827 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp1_); -#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1827 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1827 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14131 "Photo.c" +#line 14256 "Photo.c" } -static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value) { -#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value) { +#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14142 "Photo.c" +#line 14267 "Photo.c" } -#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14148 "Photo.c" +#line 14273 "Photo.c" } -static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value) { -#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value) { +#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14159 "Photo.c" +#line 14284 "Photo.c" } -#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14165 "Photo.c" +#line 14290 "Photo.c" } -static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value) { -#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value) { +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14176 "Photo.c" +#line 14301 "Photo.c" } -#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14182 "Photo.c" +#line 14307 "Photo.c" } -static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value) { -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value) { +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14193 "Photo.c" +#line 14318 "Photo.c" } -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14199 "Photo.c" +#line 14324 "Photo.c" } @@ -14212,43 +14337,43 @@ void photo_set_master_file (Photo* self, GFile* file) { GFile* old_file = NULL; gboolean _tmp41_; GError * _inner_error_ = NULL; -#line 1813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1832 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1832 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); -#line 1814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file; -#line 1814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 1814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" filepath = _tmp1_; -#line 1816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1835 "/home/jens/Source/shotwell/src/Photo.vala" altered = FALSE; -#line 1817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" is_baseline = FALSE; -#line 1818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1837 "/home/jens/Source/shotwell/src/Photo.vala" is_source = FALSE; -#line 1819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1838 "/home/jens/Source/shotwell/src/Photo.vala" name_changed = FALSE; -#line 1820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1839 "/home/jens/Source/shotwell/src/Photo.vala" old_file = NULL; -#line 14234 "Photo.c" +#line 14359 "Photo.c" { { PhotoRow* _tmp2_; -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 14242 "Photo.c" +#line 14367 "Photo.c" { { PhotoBackingReaders* _tmp3_; -#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1842 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1842 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 14250 "Photo.c" +#line 14375 "Photo.c" { PhotoBackingReaders* _tmp4_; PhotoFileReader* _tmp5_; @@ -14256,25 +14381,25 @@ void photo_set_master_file (Photo* self, GFile* file) { GFile* _tmp7_; GFile* _tmp8_; gboolean _tmp9_; -#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1843 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1843 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->master; -#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1843 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1843 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1843 "/home/jens/Source/shotwell/src/Photo.vala" old_file = _tmp6_; -#line 1825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = file; -#line 1825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = old_file; -#line 1825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = g_file_equal (_tmp7_, _tmp8_); -#line 1825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp9_) { -#line 14276 "Photo.c" +#line 14401 "Photo.c" PhotoTable* _tmp10_; PhotoTable* _tmp11_; PhotoID _tmp12_ = {0}; @@ -14297,196 +14422,196 @@ void photo_set_master_file (Photo* self, GFile* file) { PhotoRow* _tmp29_; const gchar* _tmp30_; gboolean _tmp31_; -#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1845 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_table_get_instance (); -#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1845 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1845 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp12_); -#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1845 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = filepath; -#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1845 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_set_filepath (_tmp11_, &_tmp12_, _tmp13_, &_inner_error_); -#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1845 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp11_); -#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1845 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14313 "Photo.c" - goto __finally314; +#line 14438 "Photo.c" + goto __finally326; } -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->master; -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = filepath; -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = g_strdup (_tmp16_); -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1847 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp15_->filepath); -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_->filepath = _tmp17_; -#line 1829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = file; -#line 1829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = g_file_get_basename (_tmp18_); -#line 1829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1848 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->priv->file_title); -#line 1829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1848 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->file_title = _tmp19_; -#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->priv->readers; -#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = self->row; -#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_->master; -#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_->file_format; -#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = filepath; -#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = photo_file_format_create_reader (_tmp23_, _tmp24_); -#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp20_->master); -#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_->master = _tmp25_; -#line 1832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" altered = TRUE; -#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1852 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = photo_is_master_baseline (self); -#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1852 "/home/jens/Source/shotwell/src/Photo.vala" is_baseline = _tmp26_; -#line 1834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1853 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = photo_is_master_source (self); -#line 1834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1853 "/home/jens/Source/shotwell/src/Photo.vala" is_source = _tmp27_; -#line 1835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = self->row; -#line 1835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_->title; -#line 1835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = is_string_empty (_tmp30_); -#line 1835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp31_) { -#line 14370 "Photo.c" +#line 14495 "Photo.c" GFile* _tmp32_; gchar* _tmp33_; gchar* _tmp34_; GFile* _tmp35_; gchar* _tmp36_; gchar* _tmp37_; -#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = old_file; -#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = g_file_get_basename (_tmp32_); -#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_; -#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = file; -#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = g_file_get_basename (_tmp35_); -#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_; -#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = g_strcmp0 (_tmp34_, _tmp37_) != 0; -#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp37_); -#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp34_); -#line 14395 "Photo.c" +#line 14520 "Photo.c" } else { -#line 1835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = FALSE; -#line 14399 "Photo.c" +#line 14524 "Photo.c" } -#line 1835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" name_changed = _tmp28_; -#line 14403 "Photo.c" +#line 14528 "Photo.c" } } - __finally314: + __finally326: { PhotoBackingReaders* _tmp38_; -#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1842 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = self->priv->readers; -#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1842 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 14413 "Photo.c" +#line 14538 "Photo.c" } -#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1842 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14417 "Photo.c" - goto __finally313; +#line 14542 "Photo.c" + goto __finally325; } } } - __finally313: + __finally325: { PhotoRow* _tmp39_; -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = self->row; -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 14429 "Photo.c" +#line 14554 "Photo.c" } -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 14435 "Photo.c" - goto __catch312_database_error; +#line 14560 "Photo.c" + goto __catch324_database_error; } -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14448 "Photo.c" +#line 14573 "Photo.c" } } } - goto __finally312; - __catch312_database_error: + goto __finally324; + __catch324_database_error: { GError* err = NULL; GError* _tmp40_; -#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1840 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1840 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1860 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = err; -#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1860 "/home/jens/Source/shotwell/src/Photo.vala" app_window_database_error (_tmp40_); -#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1840 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 14467 "Photo.c" +#line 14592 "Photo.c" } - __finally312: -#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" + __finally324: +#line 1840 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1840 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1840 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1840 "/home/jens/Source/shotwell/src/Photo.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 1821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1840 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1840 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14482 "Photo.c" +#line 14607 "Photo.c" } -#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = altered; -#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1863 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 14488 "Photo.c" +#line 14613 "Photo.c" GFile* _tmp42_; GFile* _tmp43_; gboolean _tmp44_; @@ -14504,162 +14629,162 @@ void photo_set_master_file (Photo* self, GFile* file) { gint _tmp57__length1; Alteration* _tmp58_; Alteration* _tmp59_; -#line 1845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = old_file; -#line 1845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = file; -#line 1845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp42_, _tmp43_); -#line 1847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1866 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = is_baseline; -#line 1847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1866 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp44_) { -#line 1848 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1867 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 14518 "Photo.c" +#line 14643 "Photo.c" } -#line 1850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1869 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = g_new0 (gchar*, 0 + 1); -#line 1850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1869 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = _tmp45_; -#line 1850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1869 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list_length1 = 0; -#line 1850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1869 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_list_size_ = alteration_list_length1; -#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = alteration_list; -#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46__length1 = alteration_list_length1; -#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = g_strdup ("backing:master"); -#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add96 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_); -#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_); +#line 1874 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = name_changed; -#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1874 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp48_) { -#line 14540 "Photo.c" +#line 14665 "Photo.c" gchar** _tmp49_; gint _tmp49__length1; gchar* _tmp50_; -#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = alteration_list; -#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49__length1 = alteration_list_length1; -#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = g_strdup ("metadata:name"); -#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add97 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_); -#line 14552 "Photo.c" +#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_); +#line 14677 "Photo.c" } -#line 1858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = is_source; -#line 1858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp51_) { -#line 14558 "Photo.c" +#line 14683 "Photo.c" gchar** _tmp52_; gint _tmp52__length1; gchar* _tmp53_; -#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = alteration_list; -#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52__length1 = alteration_list_length1; -#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = g_strdup ("backing:source"); -#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add98 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_); -#line 14570 "Photo.c" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_); +#line 14695 "Photo.c" } -#line 1861 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = is_baseline; -#line 1861 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp54_) { -#line 14576 "Photo.c" +#line 14701 "Photo.c" gchar** _tmp55_; gint _tmp55__length1; gchar* _tmp56_; -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = alteration_list; -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55__length1 = alteration_list_length1; -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = g_strdup ("backing:baseline"); -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add99 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_); -#line 14588 "Photo.c" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_); +#line 14713 "Photo.c" } -#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1883 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = alteration_list; -#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1883 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57__length1 = alteration_list_length1; -#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1883 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = alteration_new_from_array (_tmp57_, _tmp57__length1); -#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1883 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = _tmp58_; -#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1883 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp59_); -#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1883 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp59_); -#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1863 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); -#line 14604 "Photo.c" +#line 14729 "Photo.c" } -#line 1813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1832 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1832 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 14610 "Photo.c" +#line 14735 "Photo.c" } -static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value) { -#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value) { +#line 1923 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1923 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1923 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14621 "Photo.c" +#line 14746 "Photo.c" } -#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1923 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1923 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14627 "Photo.c" +#line 14752 "Photo.c" } -static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value) { -#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value) { +#line 1926 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1926 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1926 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14638 "Photo.c" +#line 14763 "Photo.c" } -#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1926 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1926 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14644 "Photo.c" +#line 14769 "Photo.c" } -static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value) { -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value) { +#line 1929 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1929 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1929 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14655 "Photo.c" +#line 14780 "Photo.c" } -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1929 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1929 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14661 "Photo.c" +#line 14786 "Photo.c" } @@ -14673,41 +14798,41 @@ void photo_set_editable_file (Photo* self, GFile* file) { GFile* old_file = NULL; gboolean _tmp34_; GError * _inner_error_ = NULL; -#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1889 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1889 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); -#line 1871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file; -#line 1871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 1871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1890 "/home/jens/Source/shotwell/src/Photo.vala" filepath = _tmp1_; -#line 1873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1892 "/home/jens/Source/shotwell/src/Photo.vala" altered = FALSE; -#line 1874 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1893 "/home/jens/Source/shotwell/src/Photo.vala" is_baseline = FALSE; -#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1894 "/home/jens/Source/shotwell/src/Photo.vala" is_source = FALSE; -#line 1876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1895 "/home/jens/Source/shotwell/src/Photo.vala" old_file = NULL; -#line 14693 "Photo.c" +#line 14818 "Photo.c" { { PhotoRow* _tmp2_; -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 14701 "Photo.c" +#line 14826 "Photo.c" { { PhotoBackingReaders* _tmp3_; -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1898 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1898 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 14709 "Photo.c" +#line 14834 "Photo.c" { GFile* _tmp4_ = NULL; PhotoBackingReaders* _tmp5_; @@ -14715,65 +14840,65 @@ void photo_set_editable_file (Photo* self, GFile* file) { GFile* _tmp10_; gboolean _tmp11_ = FALSE; GFile* _tmp12_; -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->readers; -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->editable; -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != NULL) { -#line 14723 "Photo.c" +#line 14848 "Photo.c" PhotoBackingReaders* _tmp7_; PhotoFileReader* _tmp8_; GFile* _tmp9_; -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->editable; -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp9_; -#line 14737 "Photo.c" +#line 14862 "Photo.c" } else { -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = NULL; -#line 14743 "Photo.c" +#line 14868 "Photo.c" } -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _g_object_ref0 (_tmp4_); -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" old_file = _tmp10_; -#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = old_file; -#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_ != NULL) { -#line 14755 "Photo.c" +#line 14880 "Photo.c" GFile* _tmp13_; GFile* _tmp14_; gboolean _tmp15_; -#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = old_file; -#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = file; -#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = g_file_equal (_tmp13_, _tmp14_); -#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = !_tmp15_; -#line 14767 "Photo.c" +#line 14892 "Photo.c" } else { -#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; -#line 14771 "Photo.c" +#line 14896 "Photo.c" } -#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 14775 "Photo.c" +#line 14900 "Photo.c" BackingPhotoTable* _tmp16_; BackingPhotoTable* _tmp17_; PhotoRow* _tmp18_; @@ -14789,150 +14914,150 @@ void photo_set_editable_file (Photo* self, GFile* file) { PhotoFileReader* _tmp28_; gboolean _tmp29_; gboolean _tmp30_; -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = backing_photo_table_get_instance (); -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->row; -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->editable_id; -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = filepath; -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_set_filepath (_tmp17_, &_tmp19_, _tmp20_, &_inner_error_); -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp17_); -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 14809 "Photo.c" - goto __finally317; +#line 14934 "Photo.c" + goto __finally329; } -#line 1884 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1903 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = self->priv->editable; -#line 1884 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1903 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = filepath; -#line 1884 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1903 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = g_strdup (_tmp22_); -#line 1884 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1903 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp21_->filepath); -#line 1884 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1903 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_->filepath = _tmp23_; -#line 1885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = self->priv->readers; -#line 1885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->priv->editable; -#line 1885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_->file_format; -#line 1885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = filepath; -#line 1885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = photo_file_format_create_reader (_tmp26_, _tmp27_); -#line 1885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp24_->editable); -#line 1885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_->editable = _tmp28_; -#line 1887 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1906 "/home/jens/Source/shotwell/src/Photo.vala" altered = TRUE; -#line 1888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = photo_is_editable_baseline (self); -#line 1888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" is_baseline = _tmp29_; -#line 1889 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1908 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = photo_is_editable_source (self); -#line 1889 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1908 "/home/jens/Source/shotwell/src/Photo.vala" is_source = _tmp30_; -#line 14846 "Photo.c" +#line 14971 "Photo.c" } -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1898 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 14850 "Photo.c" +#line 14975 "Photo.c" } - __finally317: + __finally329: { PhotoBackingReaders* _tmp31_; -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1898 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = self->priv->readers; -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1898 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 14859 "Photo.c" +#line 14984 "Photo.c" } -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1898 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14863 "Photo.c" - goto __finally316; +#line 14988 "Photo.c" + goto __finally328; } } } - __finally316: + __finally328: { PhotoRow* _tmp32_; -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = self->row; -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 14875 "Photo.c" +#line 15000 "Photo.c" } -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 14881 "Photo.c" - goto __catch315_database_error; +#line 15006 "Photo.c" + goto __catch327_database_error; } -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14894 "Photo.c" +#line 15019 "Photo.c" } } } - goto __finally315; - __catch315_database_error: + goto __finally327; + __catch327_database_error: { GError* err = NULL; GError* _tmp33_; -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1896 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1896 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = err; -#line 1894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1913 "/home/jens/Source/shotwell/src/Photo.vala" app_window_database_error (_tmp33_); -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1896 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 14913 "Photo.c" +#line 15038 "Photo.c" } - __finally315: -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" + __finally327: +#line 1896 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1896 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1896 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1896 "/home/jens/Source/shotwell/src/Photo.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 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1896 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1896 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14928 "Photo.c" +#line 15053 "Photo.c" } -#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1916 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = altered; -#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1916 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp34_) { -#line 14934 "Photo.c" +#line 15059 "Photo.c" GFile* _tmp35_; GFile* _tmp36_; gboolean _tmp37_; @@ -14949,93 +15074,93 @@ void photo_set_editable_file (Photo* self, GFile* file) { gint _tmp47__length1; Alteration* _tmp48_; Alteration* _tmp49_; -#line 1898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1917 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = old_file; -#line 1898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1917 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = file; -#line 1898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1917 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_editable_replaced (self, _tmp35_, _tmp36_); -#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1919 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = is_baseline; -#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1919 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp37_) { -#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 14963 "Photo.c" +#line 15088 "Photo.c" } -#line 1903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = g_new0 (gchar*, 0 + 1); -#line 1903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = _tmp38_; -#line 1903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list_length1 = 0; -#line 1903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_list_size_ = alteration_list_length1; -#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = alteration_list; -#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39__length1 = alteration_list_length1; -#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = g_strdup ("backing:editable"); -#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_); -#line 1906 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1923 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_); +#line 1925 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = is_baseline; -#line 1906 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1925 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 14985 "Photo.c" +#line 15110 "Photo.c" gchar** _tmp42_; gint _tmp42__length1; gchar* _tmp43_; -#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = alteration_list; -#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42__length1 = alteration_list_length1; -#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = g_strdup ("backing:baseline"); -#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_); -#line 14997 "Photo.c" +#line 1926 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_); +#line 15122 "Photo.c" } -#line 1909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = is_source; -#line 1909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1928 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp44_) { -#line 15003 "Photo.c" +#line 15128 "Photo.c" gchar** _tmp45_; gint _tmp45__length1; gchar* _tmp46_; -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1929 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = alteration_list; -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1929 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45__length1 = alteration_list_length1; -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1929 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = g_strdup ("backing:source"); -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_); -#line 15015 "Photo.c" +#line 1929 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_); +#line 15140 "Photo.c" } -#line 1912 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1931 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = alteration_list; -#line 1912 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1931 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47__length1 = alteration_list_length1; -#line 1912 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1931 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = alteration_new_from_array (_tmp47_, _tmp47__length1); -#line 1912 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1931 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = _tmp48_; -#line 1912 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1931 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp49_); -#line 1912 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1931 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp49_); -#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1916 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); -#line 15031 "Photo.c" +#line 15156 "Photo.c" } -#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1889 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1889 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 15037 "Photo.c" +#line 15162 "Photo.c" } @@ -15044,19 +15169,19 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) { GeeMap* _tmp0_; GeeMapIterator* _tmp1_; GError * _inner_error_ = NULL; -#line 1917 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1936 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 1918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1937 "/home/jens/Source/shotwell/src/Photo.vala" database_table_begin_transaction (); -#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1939 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = map; -#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1939 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_map_map_iterator (_tmp0_); -#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1939 "/home/jens/Source/shotwell/src/Photo.vala" map_iter = _tmp1_; -#line 1921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 15058 "Photo.c" +#line 15183 "Photo.c" GeeMapIterator* _tmp2_; gboolean _tmp3_; GeeMapIterator* _tmp4_; @@ -15065,64 +15190,64 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) { GeeMapIterator* _tmp7_; gpointer _tmp8_; GFile* _tmp9_; -#line 1921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map_iter; -#line 1921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = gee_map_iterator_next (_tmp2_); -#line 1921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 1921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 15075 "Photo.c" +#line 15200 "Photo.c" } -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1941 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map_iter; -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1941 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_map_iterator_get_key (_tmp4_); -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1941 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = (Photo*) _tmp5_; -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1941 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = map_iter; -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1941 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = gee_map_iterator_get_value (_tmp7_); -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1941 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = (GFile*) _tmp8_; -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1941 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_editable_file (_tmp6_, _tmp9_); -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1941 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp9_); -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1941 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp6_); -#line 15095 "Photo.c" +#line 15220 "Photo.c" } -#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1943 "/home/jens/Source/shotwell/src/Photo.vala" database_table_commit_transaction (&_inner_error_); -#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1943 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1943 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1943 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1943 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map_iter); -#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1943 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15109 "Photo.c" +#line 15234 "Photo.c" } else { -#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1943 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map_iter); -#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1943 "/home/jens/Source/shotwell/src/Photo.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 1924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1943 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1943 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15119 "Photo.c" +#line 15244 "Photo.c" } } -#line 1917 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1936 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map_iter); -#line 15124 "Photo.c" +#line 15249 "Photo.c" } @@ -15132,23 +15257,23 @@ GFile* photo_get_actual_file (Photo* self) { PhotoFileReader* _tmp1_; GFile* _tmp2_; GFile* _tmp3_; -#line 1929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 1930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_baseline_reader (self); -#line 1930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp1_); -#line 1930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 1930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15150 "Photo.c" +#line 15275 "Photo.c" } @@ -15159,23 +15284,23 @@ static GFile* photo_real_get_master_file (MediaSource* base) { PhotoFileReader* _tmp1_; GFile* _tmp2_; GFile* _tmp3_; -#line 1933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1952 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1953 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_master_reader (self); -#line 1934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1953 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1953 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1953 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1953 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp1_); -#line 1934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1953 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 1934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1953 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15177 "Photo.c" +#line 15302 "Photo.c" } @@ -15185,42 +15310,42 @@ GFile* photo_get_editable_file (Photo* self) { PhotoFileReader* _tmp0_; GFile* _tmp1_ = NULL; PhotoFileReader* _tmp2_; -#line 1937 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1956 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 1938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_editable_reader (self); -#line 1938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" reader = _tmp0_; -#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; -#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 15197 "Photo.c" +#line 15322 "Photo.c" PhotoFileReader* _tmp3_; GFile* _tmp4_; -#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = reader; -#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp4_; -#line 15208 "Photo.c" +#line 15333 "Photo.c" } else { -#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 15214 "Photo.c" +#line 15339 "Photo.c" } -#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15222 "Photo.c" +#line 15347 "Photo.c" } @@ -15230,30 +15355,30 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { GeeArrayList* ret = NULL; GeeArrayList* _tmp1_; GError * _inner_error_ = NULL; -#line 1943 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1962 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 1944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_master_file_format (self); -#line 1944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1963 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { -#line 1945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1964 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 1945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1964 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15242 "Photo.c" +#line 15367 "Photo.c" } -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1966 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1966 "/home/jens/Source/shotwell/src/Photo.vala" ret = _tmp1_; -#line 15248 "Photo.c" +#line 15373 "Photo.c" { PhotoRow* _tmp2_; -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15255 "Photo.c" +#line 15380 "Photo.c" { { GeeIterator* _row_it = NULL; @@ -15263,25 +15388,25 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { GeeCollection* _tmp6_; GeeIterator* _tmp7_; GeeIterator* _tmp8_; -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->developments; -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp6_); -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _row_it = _tmp8_; -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 15283 "Photo.c" +#line 15408 "Photo.c" GeeIterator* _tmp9_; gboolean _tmp10_; BackingPhotoRow* row = NULL; @@ -15292,72 +15417,72 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { const gchar* _tmp15_; GFile* _tmp16_; GFile* _tmp17_; -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _row_it; -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = gee_iterator_next (_tmp9_); -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp10_) { -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 15302 "Photo.c" +#line 15427 "Photo.c" } -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _row_it; -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = gee_iterator_get (_tmp11_); -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" row = (BackingPhotoRow*) _tmp12_; -#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = ret; -#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = row; -#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->filepath; -#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = g_file_new_for_path (_tmp15_); -#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1969 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); -#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1969 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp17_); -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 15326 "Photo.c" +#line 15451 "Photo.c" } -#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 15330 "Photo.c" +#line 15455 "Photo.c" } } - __finally318: + __finally330: { PhotoRow* _tmp18_; -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->row; -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15340 "Photo.c" +#line 15465 "Photo.c" } -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (ret); -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1967 "/home/jens/Source/shotwell/src/Photo.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 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 15352 "Photo.c" +#line 15477 "Photo.c" } } -#line 1953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1972 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (ret, GEE_TYPE_COLLECTION, GeeCollection); -#line 1953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1972 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15359 "Photo.c" +#line 15484 "Photo.c" } @@ -15367,77 +15492,77 @@ GFile* photo_get_source_file (Photo* self) { PhotoFileReader* _tmp1_; GFile* _tmp2_; GFile* _tmp3_; -#line 1956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_source_reader (self); -#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp1_); -#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15385 "Photo.c" +#line 15510 "Photo.c" } PhotoFileFormat photo_get_file_format (Photo* self) { PhotoFileFormat result = 0; GError * _inner_error_ = NULL; -#line 1960 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1979 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 15394 "Photo.c" +#line 15519 "Photo.c" { PhotoRow* _tmp0_; -#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15401 "Photo.c" +#line 15526 "Photo.c" { BackingPhotoRow* _tmp1_; PhotoFileFormat _tmp2_; -#line 1962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->backing_photo_row; -#line 1962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->file_format; -#line 1962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 15411 "Photo.c" +#line 15536 "Photo.c" { PhotoRow* _tmp3_; -#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15418 "Photo.c" +#line 15543 "Photo.c" } -#line 1962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15422 "Photo.c" +#line 15547 "Photo.c" } - __finally319: + __finally331: { PhotoRow* _tmp4_; -#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15431 "Photo.c" +#line 15556 "Photo.c" } -#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1980 "/home/jens/Source/shotwell/src/Photo.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 1961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 15439 "Photo.c" +#line 15564 "Photo.c" } } @@ -15448,88 +15573,88 @@ PhotoFileFormat photo_get_best_export_file_format (Photo* self) { PhotoFileFormat _tmp0_; PhotoFileFormat _tmp1_; gboolean _tmp2_; -#line 1966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1985 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1986 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_file_format (self); -#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1986 "/home/jens/Source/shotwell/src/Photo.vala" file_format = _tmp0_; -#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file_format; -#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_format_can_write (_tmp1_); -#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp2_) { -#line 15462 "Photo.c" +#line 15587 "Photo.c" PhotoFileFormat _tmp3_; -#line 1969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_format_get_system_default_format (); -#line 1969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1988 "/home/jens/Source/shotwell/src/Photo.vala" file_format = _tmp3_; -#line 15468 "Photo.c" +#line 15593 "Photo.c" } -#line 1971 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1990 "/home/jens/Source/shotwell/src/Photo.vala" result = file_format; -#line 1971 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1990 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15474 "Photo.c" +#line 15599 "Photo.c" } PhotoFileFormat photo_get_master_file_format (Photo* self) { PhotoFileFormat result = 0; GError * _inner_error_ = NULL; -#line 1974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1993 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 15483 "Photo.c" +#line 15608 "Photo.c" { PhotoRow* _tmp0_; -#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15490 "Photo.c" +#line 15615 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; PhotoFileFormat _tmp3_; -#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; -#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1995 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 15503 "Photo.c" +#line 15628 "Photo.c" { PhotoRow* _tmp4_; -#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15510 "Photo.c" +#line 15635 "Photo.c" } -#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1995 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15514 "Photo.c" +#line 15639 "Photo.c" } - __finally320: + __finally332: { PhotoRow* _tmp5_; -#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15523 "Photo.c" +#line 15648 "Photo.c" } -#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1994 "/home/jens/Source/shotwell/src/Photo.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 1975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 15531 "Photo.c" +#line 15656 "Photo.c" } } @@ -15538,109 +15663,109 @@ static time_t photo_real_get_timestamp (MediaSource* base) { Photo * self; time_t result = 0; GError * _inner_error_ = NULL; -#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1999 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15542 "Photo.c" +#line 15667 "Photo.c" { PhotoRow* _tmp0_; time_t _tmp5_ = 0; -#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15550 "Photo.c" +#line 15675 "Photo.c" { BackingPhotoRow* _tmp1_; time_t _tmp2_; -#line 1982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->backing_photo_row; -#line 1982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->timestamp; -#line 1982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2001 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 15560 "Photo.c" +#line 15685 "Photo.c" { PhotoRow* _tmp3_; -#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15567 "Photo.c" +#line 15692 "Photo.c" } -#line 1982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2001 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15571 "Photo.c" +#line 15696 "Photo.c" } - __finally321: + __finally333: { PhotoRow* _tmp4_; -#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15580 "Photo.c" +#line 15705 "Photo.c" } -#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2000 "/home/jens/Source/shotwell/src/Photo.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 1981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2000 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2000 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 15588 "Photo.c" +#line 15713 "Photo.c" } } void photo_get_photo_id (Photo* self, PhotoID* result) { GError * _inner_error_ = NULL; -#line 1986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2005 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 15597 "Photo.c" +#line 15722 "Photo.c" { PhotoRow* _tmp0_; -#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2006 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2006 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15604 "Photo.c" +#line 15729 "Photo.c" { PhotoRow* _tmp1_; PhotoID _tmp2_; -#line 1988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 1988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->photo_id; -#line 1988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2007 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15614 "Photo.c" +#line 15739 "Photo.c" { PhotoRow* _tmp3_; -#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2006 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2006 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15621 "Photo.c" +#line 15746 "Photo.c" } -#line 1988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2007 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15625 "Photo.c" +#line 15750 "Photo.c" } - __finally322: + __finally334: { PhotoRow* _tmp4_; -#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2006 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2006 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15634 "Photo.c" +#line 15759 "Photo.c" } -#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2006 "/home/jens/Source/shotwell/src/Photo.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 1987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2006 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2006 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15642 "Photo.c" +#line 15767 "Photo.c" } } @@ -15649,17 +15774,17 @@ static inline void photo_real_get_event_id (MediaSource* base, EventID* result) Photo * self; PhotoRow* _tmp0_; EventID _tmp1_; -#line 1993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2012 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2013 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2013 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_->event_id; -#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2013 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp1_; -#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2013 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15661 "Photo.c" +#line 15786 "Photo.c" } @@ -15668,127 +15793,127 @@ inline gint64 photo_get_raw_event_id (Photo* self) { PhotoRow* _tmp0_; EventID _tmp1_; gint64 _tmp2_; -#line 1998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2017 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0LL); -#line 1999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2018 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2018 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_->event_id; -#line 1999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2018 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_.id; -#line 1999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2018 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 1999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2018 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15682 "Photo.c" +#line 15807 "Photo.c" } static void photo_real_get_import_id (MediaSource* base, ImportID* result) { Photo * self; GError * _inner_error_ = NULL; -#line 2002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2021 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15691 "Photo.c" +#line 15816 "Photo.c" { PhotoRow* _tmp0_; -#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15698 "Photo.c" +#line 15823 "Photo.c" { PhotoRow* _tmp1_; ImportID _tmp2_; -#line 2004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->import_id; -#line 2004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15708 "Photo.c" +#line 15833 "Photo.c" { PhotoRow* _tmp3_; -#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15715 "Photo.c" +#line 15840 "Photo.c" } -#line 2004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15719 "Photo.c" +#line 15844 "Photo.c" } - __finally323: + __finally335: { PhotoRow* _tmp4_; -#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15728 "Photo.c" +#line 15853 "Photo.c" } -#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2022 "/home/jens/Source/shotwell/src/Photo.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 2003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15736 "Photo.c" +#line 15861 "Photo.c" } } void photo_get_editable_id (Photo* self, BackingPhotoID* result) { GError * _inner_error_ = NULL; -#line 2008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2027 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 15745 "Photo.c" +#line 15870 "Photo.c" { PhotoRow* _tmp0_; -#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15752 "Photo.c" +#line 15877 "Photo.c" { PhotoRow* _tmp1_; BackingPhotoID _tmp2_; -#line 2010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2029 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2029 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable_id; -#line 2010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2029 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15762 "Photo.c" +#line 15887 "Photo.c" { PhotoRow* _tmp3_; -#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15769 "Photo.c" +#line 15894 "Photo.c" } -#line 2010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2029 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15773 "Photo.c" +#line 15898 "Photo.c" } - __finally324: + __finally336: { PhotoRow* _tmp4_; -#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15782 "Photo.c" +#line 15907 "Photo.c" } -#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2028 "/home/jens/Source/shotwell/src/Photo.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 2009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15790 "Photo.c" +#line 15915 "Photo.c" } } @@ -15797,57 +15922,57 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; -#line 2014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2033 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15801 "Photo.c" +#line 15926 "Photo.c" { PhotoRow* _tmp0_; -#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2034 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15808 "Photo.c" +#line 15933 "Photo.c" { PhotoRow* _tmp1_; const gchar* _tmp2_; gchar* _tmp3_; -#line 2016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2035 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2035 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->md5; -#line 2016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2035 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = g_strdup (_tmp2_); -#line 2016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2035 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 15821 "Photo.c" +#line 15946 "Photo.c" { PhotoRow* _tmp4_; -#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2034 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15828 "Photo.c" +#line 15953 "Photo.c" } -#line 2016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2035 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15832 "Photo.c" +#line 15957 "Photo.c" } - __finally325: + __finally337: { PhotoRow* _tmp5_; -#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2034 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15841 "Photo.c" +#line 15966 "Photo.c" } -#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2034 "/home/jens/Source/shotwell/src/Photo.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 2015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2034 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2034 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 15849 "Photo.c" +#line 15974 "Photo.c" } } @@ -15855,55 +15980,55 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { guint64 photo_get_flags (Photo* self) { guint64 result = 0ULL; GError * _inner_error_ = NULL; -#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2041 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 15859 "Photo.c" +#line 15984 "Photo.c" { PhotoRow* _tmp0_; guint64 _tmp5_ = 0ULL; -#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15867 "Photo.c" +#line 15992 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; -#line 2024 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2043 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2024 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2043 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; -#line 2024 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2043 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 15877 "Photo.c" +#line 16002 "Photo.c" { PhotoRow* _tmp3_; -#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15884 "Photo.c" +#line 16009 "Photo.c" } -#line 2024 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2043 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15888 "Photo.c" +#line 16013 "Photo.c" } - __finally326: + __finally338: { PhotoRow* _tmp4_; -#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15897 "Photo.c" +#line 16022 "Photo.c" } -#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2042 "/home/jens/Source/shotwell/src/Photo.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 2023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2042 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2042 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 15905 "Photo.c" +#line 16030 "Photo.c" } } @@ -15913,41 +16038,41 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte Alteration* _tmp0_; Alteration* _tmp1_; Alteration* _tmp5_; -#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2047 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2047 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration)); -#line 2029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2048 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = alteration_new ("metadata", "flags"); -#line 2029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2048 "/home/jens/Source/shotwell/src/Photo.vala" alteration = _tmp0_; -#line 2030 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2049 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = additional_alteration; -#line 2030 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2049 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 15927 "Photo.c" +#line 16052 "Photo.c" Alteration* _tmp2_; Alteration* _tmp3_; Alteration* _tmp4_; -#line 2031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = alteration; -#line 2031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = additional_alteration; -#line 2031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = alteration_compress (_tmp2_, _tmp3_); -#line 2031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (alteration); -#line 2031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" alteration = _tmp4_; -#line 15941 "Photo.c" +#line 16066 "Photo.c" } -#line 2033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = alteration; -#line 2033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_); -#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2047 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (alteration); -#line 15949 "Photo.c" +#line 16074 "Photo.c" } @@ -15957,18 +16082,18 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_ gboolean _tmp11_; guint64 _tmp13_; GError * _inner_error_ = NULL; -#line 2036 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2055 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 2036 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2055 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL); -#line 15963 "Photo.c" +#line 16088 "Photo.c" { PhotoRow* _tmp0_; -#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2057 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2057 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15970 "Photo.c" +#line 16095 "Photo.c" { PhotoTable* _tmp1_; PhotoTable* _tmp2_; @@ -15976,138 +16101,138 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_ guint64 _tmp4_; gboolean _tmp5_; gboolean _tmp6_; -#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp3_); -#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = flags; -#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_table_replace_flags (_tmp2_, &_tmp3_, _tmp4_); -#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp5_; -#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 2040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2059 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = committed; -#line 2040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2059 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 15996 "Photo.c" +#line 16121 "Photo.c" PhotoRow* _tmp7_; guint64 _tmp8_; -#line 2041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 2041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = flags; -#line 2041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_->flags = _tmp8_; -#line 16005 "Photo.c" +#line 16130 "Photo.c" } } - __finally327: + __finally339: { PhotoRow* _tmp9_; -#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2057 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2057 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16015 "Photo.c" +#line 16140 "Photo.c" } -#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2057 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16019 "Photo.c" +#line 16144 "Photo.c" guint64 _tmp10_ = 0ULL; -#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2057 "/home/jens/Source/shotwell/src/Photo.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 2038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2057 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2057 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp10_; -#line 16027 "Photo.c" +#line 16152 "Photo.c" } } -#line 2044 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = committed; -#line 2044 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 16034 "Photo.c" +#line 16159 "Photo.c" Alteration* _tmp12_; -#line 2045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2064 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = additional_alteration; -#line 2045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2064 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_flags_altered (self, _tmp12_); -#line 16040 "Photo.c" +#line 16165 "Photo.c" } -#line 2047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2066 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = flags; -#line 2047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2066 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp13_; -#line 2047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2066 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16048 "Photo.c" +#line 16173 "Photo.c" } gboolean photo_is_flag_set (Photo* self, guint64 mask) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2069 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 16057 "Photo.c" +#line 16182 "Photo.c" { PhotoRow* _tmp0_; gboolean _tmp7_ = FALSE; -#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16065 "Photo.c" +#line 16190 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; guint64 _tmp3_; gboolean _tmp4_; -#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; -#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = mask; -#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_); -#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2071 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 16081 "Photo.c" +#line 16206 "Photo.c" { PhotoRow* _tmp5_; -#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16088 "Photo.c" +#line 16213 "Photo.c" } -#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2071 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16092 "Photo.c" +#line 16217 "Photo.c" } - __finally328: + __finally340: { PhotoRow* _tmp6_; -#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16101 "Photo.c" +#line 16226 "Photo.c" } -#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2070 "/home/jens/Source/shotwell/src/Photo.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 2051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp7_; -#line 16109 "Photo.c" +#line 16234 "Photo.c" } } @@ -16118,22 +16243,22 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter gboolean committed = FALSE; gboolean _tmp18_; GError * _inner_error_ = NULL; -#line 2056 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2075 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 2056 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2075 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL); -#line 2057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2076 "/home/jens/Source/shotwell/src/Photo.vala" flags = (guint64) 0; -#line 2059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2078 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16128 "Photo.c" +#line 16253 "Photo.c" { PhotoRow* _tmp0_; -#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16135 "Photo.c" +#line 16260 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; @@ -16142,101 +16267,101 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter PhotoRow* _tmp5_; guint64 _tmp6_; guint64 _tmp7_; -#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; -#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = mask; -#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_); -#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" flags = _tmp4_; -#line 2062 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2062 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->flags; -#line 2062 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = flags; -#line 2062 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != _tmp7_) { -#line 16162 "Photo.c" +#line 16287 "Photo.c" PhotoTable* _tmp8_; PhotoTable* _tmp9_; PhotoID _tmp10_ = {0}; guint64 _tmp11_; gboolean _tmp12_; gboolean _tmp13_; -#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_table_get_instance (); -#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp10_); -#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = flags; -#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_); -#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp12_; -#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp9_); -#line 2064 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2083 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = committed; -#line 2064 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2083 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 16187 "Photo.c" +#line 16312 "Photo.c" PhotoRow* _tmp14_; guint64 _tmp15_; -#line 2065 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2084 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2065 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2084 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = flags; -#line 2065 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2084 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->flags = _tmp15_; -#line 16196 "Photo.c" +#line 16321 "Photo.c" } } } - __finally329: + __finally341: { PhotoRow* _tmp16_; -#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->row; -#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16207 "Photo.c" +#line 16332 "Photo.c" } -#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16211 "Photo.c" +#line 16336 "Photo.c" guint64 _tmp17_ = 0ULL; -#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2079 "/home/jens/Source/shotwell/src/Photo.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 2060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp17_; -#line 16219 "Photo.c" +#line 16344 "Photo.c" } } -#line 2069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = committed; -#line 2069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2088 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_) { -#line 16226 "Photo.c" +#line 16351 "Photo.c" Alteration* _tmp19_; -#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2089 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = additional_alteration; -#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2089 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_flags_altered (self, _tmp19_); -#line 16232 "Photo.c" +#line 16357 "Photo.c" } -#line 2072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2091 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; -#line 2072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2091 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16238 "Photo.c" +#line 16363 "Photo.c" } @@ -16246,22 +16371,22 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al gboolean committed = FALSE; gboolean _tmp18_; GError * _inner_error_ = NULL; -#line 2075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2094 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 2075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2094 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL); -#line 2076 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2095 "/home/jens/Source/shotwell/src/Photo.vala" flags = (guint64) 0; -#line 2078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2097 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16256 "Photo.c" +#line 16381 "Photo.c" { PhotoRow* _tmp0_; -#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16263 "Photo.c" +#line 16388 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; @@ -16270,101 +16395,101 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al PhotoRow* _tmp5_; guint64 _tmp6_; guint64 _tmp7_; -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = mask; -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_); -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" flags = _tmp4_; -#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->flags; -#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = flags; -#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != _tmp7_) { -#line 16290 "Photo.c" +#line 16415 "Photo.c" PhotoTable* _tmp8_; PhotoTable* _tmp9_; PhotoID _tmp10_ = {0}; guint64 _tmp11_; gboolean _tmp12_; gboolean _tmp13_; -#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_table_get_instance (); -#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp10_); -#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = flags; -#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_); -#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp12_; -#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp9_); -#line 2083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = committed; -#line 2083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2102 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 16315 "Photo.c" +#line 16440 "Photo.c" PhotoRow* _tmp14_; guint64 _tmp15_; -#line 2084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = flags; -#line 2084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->flags = _tmp15_; -#line 16324 "Photo.c" +#line 16449 "Photo.c" } } } - __finally330: + __finally342: { PhotoRow* _tmp16_; -#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->row; -#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16335 "Photo.c" +#line 16460 "Photo.c" } -#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16339 "Photo.c" +#line 16464 "Photo.c" guint64 _tmp17_ = 0ULL; -#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2098 "/home/jens/Source/shotwell/src/Photo.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 2079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp17_; -#line 16347 "Photo.c" +#line 16472 "Photo.c" } } -#line 2088 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2107 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = committed; -#line 2088 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2107 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_) { -#line 16354 "Photo.c" +#line 16479 "Photo.c" Alteration* _tmp19_; -#line 2089 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2108 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = additional_alteration; -#line 2089 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2108 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_flags_altered (self, _tmp19_); -#line 16360 "Photo.c" +#line 16485 "Photo.c" } -#line 2091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2110 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; -#line 2091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2110 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16366 "Photo.c" +#line 16491 "Photo.c" } @@ -16374,22 +16499,22 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera gboolean committed = FALSE; gboolean _tmp18_; GError * _inner_error_ = NULL; -#line 2094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2113 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 2094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2113 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL); -#line 2095 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2114 "/home/jens/Source/shotwell/src/Photo.vala" flags = (guint64) 0; -#line 2097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2116 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16384 "Photo.c" +#line 16509 "Photo.c" { PhotoRow* _tmp0_; -#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16391 "Photo.c" +#line 16516 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; @@ -16398,101 +16523,101 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera PhotoRow* _tmp5_; guint64 _tmp6_; guint64 _tmp7_; -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = add; -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = remove; -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" flags = (_tmp2_ | _tmp3_) & (~_tmp4_); -#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->flags; -#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = flags; -#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != _tmp7_) { -#line 16418 "Photo.c" +#line 16543 "Photo.c" PhotoTable* _tmp8_; PhotoTable* _tmp9_; PhotoID _tmp10_ = {0}; guint64 _tmp11_; gboolean _tmp12_; gboolean _tmp13_; -#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_table_get_instance (); -#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp10_); -#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = flags; -#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_); -#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp12_; -#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp9_); -#line 2102 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2121 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = committed; -#line 2102 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2121 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 16443 "Photo.c" +#line 16568 "Photo.c" PhotoRow* _tmp14_; guint64 _tmp15_; -#line 2103 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2103 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = flags; -#line 2103 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->flags = _tmp15_; -#line 16452 "Photo.c" +#line 16577 "Photo.c" } } } - __finally331: + __finally343: { PhotoRow* _tmp16_; -#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->row; -#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16463 "Photo.c" +#line 16588 "Photo.c" } -#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16467 "Photo.c" +#line 16592 "Photo.c" guint64 _tmp17_ = 0ULL; -#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2117 "/home/jens/Source/shotwell/src/Photo.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 2098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp17_; -#line 16475 "Photo.c" +#line 16600 "Photo.c" } } -#line 2107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2126 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = committed; -#line 2107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2126 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_) { -#line 16482 "Photo.c" +#line 16607 "Photo.c" Alteration* _tmp19_; -#line 2108 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2127 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = additional_alteration; -#line 2108 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2127 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_flags_altered (self, _tmp19_); -#line 16488 "Photo.c" +#line 16613 "Photo.c" } -#line 2110 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2129 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; -#line 2110 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2129 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16494 "Photo.c" +#line 16619 "Photo.c" } @@ -16500,34 +16625,34 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati GeeCollection* _tmp0_; GeeCollection* _tmp10_; GError * _inner_error_ = NULL; -#line 2113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2132 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((add == NULL) || GEE_IS_COLLECTION (add)); -#line 2113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2132 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((additional_add_alteration == NULL) || IS_ALTERATION (additional_add_alteration)); -#line 2113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2132 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((remove == NULL) || GEE_IS_COLLECTION (remove)); -#line 2113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2132 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((additional_remove_alteration == NULL) || IS_ALTERATION (additional_remove_alteration)); -#line 2116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" database_table_begin_transaction (); -#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = add; -#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 16516 "Photo.c" +#line 16641 "Photo.c" { GeeIterator* _photo_it = NULL; GeeCollection* _tmp1_; GeeIterator* _tmp2_; -#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = add; -#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _photo_it = _tmp2_; -#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 16529 "Photo.c" +#line 16654 "Photo.c" GeeIterator* _tmp3_; gboolean _tmp4_; Photo* photo = NULL; @@ -16536,57 +16661,57 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati Photo* _tmp7_; guint64 _tmp8_; Alteration* _tmp9_; -#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _photo_it; -#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp4_) { -#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 16546 "Photo.c" +#line 16671 "Photo.c" } -#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _photo_it; -#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" photo = (Photo*) _tmp6_; -#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2139 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo; -#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2139 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = add_mask; -#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2139 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = additional_add_alteration; -#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2139 "/home/jens/Source/shotwell/src/Photo.vala" photo_add_flags (_tmp7_, _tmp8_, _tmp9_); -#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 16564 "Photo.c" +#line 16689 "Photo.c" } -#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 16568 "Photo.c" +#line 16693 "Photo.c" } } -#line 2123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2142 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = remove; -#line 2123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2142 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_ != NULL) { -#line 16575 "Photo.c" +#line 16700 "Photo.c" { GeeIterator* _photo_it = NULL; GeeCollection* _tmp11_; GeeIterator* _tmp12_; -#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = remove; -#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" _photo_it = _tmp12_; -#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 16588 "Photo.c" +#line 16713 "Photo.c" GeeIterator* _tmp13_; gboolean _tmp14_; Photo* photo = NULL; @@ -16595,58 +16720,58 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati Photo* _tmp17_; guint64 _tmp18_; Alteration* _tmp19_; -#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _photo_it; -#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = gee_iterator_next (_tmp13_); -#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp14_) { -#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 16605 "Photo.c" +#line 16730 "Photo.c" } -#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _photo_it; -#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = gee_iterator_get (_tmp15_); -#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" photo = (Photo*) _tmp16_; -#line 2125 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2144 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo; -#line 2125 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2144 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = remove_mask; -#line 2125 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2144 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = additional_remove_alteration; -#line 2125 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2144 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (_tmp17_, _tmp18_, _tmp19_); -#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 16623 "Photo.c" +#line 16748 "Photo.c" } -#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 16627 "Photo.c" +#line 16752 "Photo.c" } } -#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2147 "/home/jens/Source/shotwell/src/Photo.vala" database_table_commit_transaction (&_inner_error_); -#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2147 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2147 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2147 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2147 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16640 "Photo.c" +#line 16765 "Photo.c" } else { -#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2147 "/home/jens/Source/shotwell/src/Photo.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 2128 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2147 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2147 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16648 "Photo.c" +#line 16773 "Photo.c" } } } @@ -16658,22 +16783,22 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al gboolean committed = FALSE; gboolean _tmp17_; GError * _inner_error_ = NULL; -#line 2131 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2150 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 2131 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2150 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL); -#line 2132 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" flags = (guint64) 0; -#line 2134 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2153 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16668 "Photo.c" +#line 16793 "Photo.c" { PhotoRow* _tmp0_; -#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2154 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16675 "Photo.c" +#line 16800 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; @@ -16681,154 +16806,154 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al PhotoRow* _tmp4_; guint64 _tmp5_; guint64 _tmp6_; -#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; -#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = mask; -#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2155 "/home/jens/Source/shotwell/src/Photo.vala" flags = _tmp2_ ^ _tmp3_; -#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->flags; -#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = flags; -#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ != _tmp6_) { -#line 16699 "Photo.c" +#line 16824 "Photo.c" PhotoTable* _tmp7_; PhotoTable* _tmp8_; PhotoID _tmp9_ = {0}; guint64 _tmp10_; gboolean _tmp11_; gboolean _tmp12_; -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_table_get_instance (); -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp9_); -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = flags; -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_table_replace_flags (_tmp8_, &_tmp9_, _tmp10_); -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp11_; -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp8_); -#line 2139 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = committed; -#line 2139 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 16724 "Photo.c" +#line 16849 "Photo.c" PhotoRow* _tmp13_; guint64 _tmp14_; -#line 2140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->row; -#line 2140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = flags; -#line 2140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_->flags = _tmp14_; -#line 16733 "Photo.c" +#line 16858 "Photo.c" } } } - __finally332: + __finally344: { PhotoRow* _tmp15_; -#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2154 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16744 "Photo.c" +#line 16869 "Photo.c" } -#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2154 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16748 "Photo.c" +#line 16873 "Photo.c" guint64 _tmp16_ = 0ULL; -#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2154 "/home/jens/Source/shotwell/src/Photo.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 2135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2154 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2154 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp16_; -#line 16756 "Photo.c" +#line 16881 "Photo.c" } } -#line 2144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2163 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = committed; -#line 2144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2163 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_) { -#line 16763 "Photo.c" +#line 16888 "Photo.c" Alteration* _tmp18_; -#line 2145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2164 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = additional_alteration; -#line 2145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2164 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_flags_altered (self, _tmp18_); -#line 16769 "Photo.c" +#line 16894 "Photo.c" } -#line 2147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2166 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; -#line 2147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2166 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16775 "Photo.c" +#line 16900 "Photo.c" } gboolean photo_is_master_metadata_dirty (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 2150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2169 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 16784 "Photo.c" +#line 16909 "Photo.c" { PhotoRow* _tmp0_; gboolean _tmp5_ = FALSE; -#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16792 "Photo.c" +#line 16917 "Photo.c" { PhotoRow* _tmp1_; gboolean _tmp2_; -#line 2152 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2152 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->metadata_dirty; -#line 2152 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 16802 "Photo.c" +#line 16927 "Photo.c" { PhotoRow* _tmp3_; -#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16809 "Photo.c" +#line 16934 "Photo.c" } -#line 2152 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16813 "Photo.c" +#line 16938 "Photo.c" } - __finally333: + __finally345: { PhotoRow* _tmp4_; -#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16822 "Photo.c" +#line 16947 "Photo.c" } -#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2170 "/home/jens/Source/shotwell/src/Photo.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 2151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 16830 "Photo.c" +#line 16955 "Photo.c" } } @@ -16837,110 +16962,110 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro gboolean committed = FALSE; gboolean _tmp11_; GError * _inner_error_ = NULL; -#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2175 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2176 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16843 "Photo.c" +#line 16968 "Photo.c" { PhotoRow* _tmp0_; -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16850 "Photo.c" +#line 16975 "Photo.c" { PhotoRow* _tmp1_; gboolean _tmp2_; gboolean _tmp3_; -#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->metadata_dirty; -#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = dirty; -#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != _tmp3_) { -#line 16863 "Photo.c" +#line 16988 "Photo.c" PhotoTable* _tmp4_; PhotoTable* _tmp5_; PhotoID _tmp6_ = {0}; gboolean _tmp7_; PhotoRow* _tmp8_; gboolean _tmp9_; -#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_table_get_instance (); -#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp6_); -#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = dirty; -#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_set_metadata_dirty (_tmp5_, &_tmp6_, _tmp7_, &_inner_error_); -#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp5_); -#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16884 "Photo.c" - goto __finally334; +#line 17009 "Photo.c" + goto __finally346; } -#line 2161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; -#line 2161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = dirty; -#line 2161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_->metadata_dirty = _tmp9_; -#line 2162 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" committed = TRUE; -#line 16895 "Photo.c" +#line 17020 "Photo.c" } } - __finally334: + __finally346: { PhotoRow* _tmp10_; -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->row; -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16905 "Photo.c" +#line 17030 "Photo.c" } -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16915 "Photo.c" +#line 17040 "Photo.c" } else { -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2177 "/home/jens/Source/shotwell/src/Photo.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 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16923 "Photo.c" +#line 17048 "Photo.c" } } } -#line 2166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2185 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = committed; -#line 2166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2185 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 16931 "Photo.c" +#line 17056 "Photo.c" Alteration* _tmp12_; Alteration* _tmp13_; -#line 2167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = alteration_new ("metadata", "master-dirty"); -#line 2167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 2167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2186 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_); -#line 2167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2186 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp13_); -#line 16942 "Photo.c" +#line 17067 "Photo.c" } } @@ -16949,54 +17074,54 @@ static Rating photo_real_get_rating (MediaSource* base) { Photo * self; Rating result = 0; GError * _inner_error_ = NULL; -#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2189 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 16953 "Photo.c" +#line 17078 "Photo.c" { PhotoRow* _tmp0_; -#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16960 "Photo.c" +#line 17085 "Photo.c" { PhotoRow* _tmp1_; Rating _tmp2_; -#line 2172 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2191 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2172 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2191 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->rating; -#line 2172 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2191 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 16970 "Photo.c" +#line 17095 "Photo.c" { PhotoRow* _tmp3_; -#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16977 "Photo.c" +#line 17102 "Photo.c" } -#line 2172 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2191 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16981 "Photo.c" +#line 17106 "Photo.c" } - __finally335: + __finally347: { PhotoRow* _tmp4_; -#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16990 "Photo.c" +#line 17115 "Photo.c" } -#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2190 "/home/jens/Source/shotwell/src/Photo.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 2171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 16998 "Photo.c" +#line 17123 "Photo.c" } } @@ -17006,122 +17131,122 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) { gboolean committed = FALSE; gboolean _tmp16_; GError * _inner_error_ = NULL; -#line 2176 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2195 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2196 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 17012 "Photo.c" +#line 17137 "Photo.c" { PhotoRow* _tmp0_; -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17019 "Photo.c" +#line 17144 "Photo.c" { gboolean _tmp1_ = FALSE; Rating _tmp2_; PhotoRow* _tmp3_; Rating _tmp4_; -#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = rating; -#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->rating; -#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != _tmp4_) { -#line 17033 "Photo.c" +#line 17158 "Photo.c" Rating _tmp5_; gboolean _tmp6_; -#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = rating; -#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = rating_is_valid (_tmp5_); -#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp6_; -#line 17042 "Photo.c" +#line 17167 "Photo.c" } else { -#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 17046 "Photo.c" +#line 17171 "Photo.c" } -#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 17050 "Photo.c" +#line 17175 "Photo.c" PhotoTable* _tmp7_; PhotoTable* _tmp8_; PhotoID _tmp9_ = {0}; Rating _tmp10_; gboolean _tmp11_; gboolean _tmp12_; -#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2200 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_table_get_instance (); -#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2200 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2200 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp9_); -#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2200 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = rating; -#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2200 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_table_set_rating (_tmp8_, &_tmp9_, _tmp10_); -#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2200 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp11_; -#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2200 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp8_); -#line 2182 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2201 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = committed; -#line 2182 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2201 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 17075 "Photo.c" +#line 17200 "Photo.c" PhotoRow* _tmp13_; Rating _tmp14_; -#line 2183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2202 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->row; -#line 2183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2202 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = rating; -#line 2183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2202 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_->rating = _tmp14_; -#line 17084 "Photo.c" +#line 17209 "Photo.c" } } } - __finally336: + __finally348: { PhotoRow* _tmp15_; -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17095 "Photo.c" +#line 17220 "Photo.c" } -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2198 "/home/jens/Source/shotwell/src/Photo.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 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17105 "Photo.c" +#line 17230 "Photo.c" } } -#line 2187 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2206 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = committed; -#line 2187 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2206 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_) { -#line 17112 "Photo.c" +#line 17237 "Photo.c" Alteration* _tmp17_; Alteration* _tmp18_; -#line 2188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = alteration_new ("metadata", "rating"); -#line 2188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_; -#line 2188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_); -#line 2188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp18_); -#line 17123 "Photo.c" +#line 17248 "Photo.c" } } @@ -17129,48 +17254,48 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) { static void photo_real_increase_rating (MediaSource* base) { Photo * self; GError * _inner_error_ = NULL; -#line 2191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2210 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17133 "Photo.c" +#line 17258 "Photo.c" { PhotoRow* _tmp0_; -#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2211 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2211 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17140 "Photo.c" +#line 17265 "Photo.c" { PhotoRow* _tmp1_; Rating _tmp2_; Rating _tmp3_; -#line 2193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->rating; -#line 2193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = rating_increase (_tmp2_); -#line 2193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2212 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_); -#line 17153 "Photo.c" +#line 17278 "Photo.c" } - __finally337: + __finally349: { PhotoRow* _tmp4_; -#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2211 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2211 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17162 "Photo.c" +#line 17287 "Photo.c" } -#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2211 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2211 "/home/jens/Source/shotwell/src/Photo.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 2192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2211 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2211 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17172 "Photo.c" +#line 17297 "Photo.c" } } } @@ -17179,48 +17304,48 @@ static void photo_real_increase_rating (MediaSource* base) { static void photo_real_decrease_rating (MediaSource* base) { Photo * self; GError * _inner_error_ = NULL; -#line 2197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2216 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17183 "Photo.c" +#line 17308 "Photo.c" { PhotoRow* _tmp0_; -#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2217 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2217 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17190 "Photo.c" +#line 17315 "Photo.c" { PhotoRow* _tmp1_; Rating _tmp2_; Rating _tmp3_; -#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->rating; -#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = rating_decrease (_tmp2_); -#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2218 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_); -#line 17203 "Photo.c" +#line 17328 "Photo.c" } - __finally338: + __finally350: { PhotoRow* _tmp4_; -#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2217 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2217 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17212 "Photo.c" +#line 17337 "Photo.c" } -#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2217 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2217 "/home/jens/Source/shotwell/src/Photo.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 2198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2217 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2217 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17222 "Photo.c" +#line 17347 "Photo.c" } } } @@ -17229,130 +17354,130 @@ static void photo_real_decrease_rating (MediaSource* base) { static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks) { Photo * self; GError * _inner_error_ = NULL; -#line 2203 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2203 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources)); -#line 17235 "Photo.c" +#line 17360 "Photo.c" { PhotoTable* _tmp0_; PhotoTable* _tmp1_; PhotoID _tmp2_ = {0}; const gchar* _tmp3_; -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2227 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2227 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2227 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp2_); -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2227 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = backlinks; -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2227 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_); -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2227 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2227 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2227 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 17257 "Photo.c" - goto __catch339_database_error; +#line 17382 "Photo.c" + goto __catch351_database_error; } -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2227 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2227 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2227 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17266 "Photo.c" +#line 17391 "Photo.c" } { PhotoRow* _tmp4_; -#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2228 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2228 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17274 "Photo.c" +#line 17399 "Photo.c" { PhotoRow* _tmp5_; const gchar* _tmp6_; gchar* _tmp7_; -#line 2210 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2229 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2210 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2229 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = backlinks; -#line 2210 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2229 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = g_strdup (_tmp6_); -#line 2210 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2229 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp5_->backlinks); -#line 2210 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2229 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_->backlinks = _tmp7_; -#line 17289 "Photo.c" +#line 17414 "Photo.c" } - __finally340: + __finally352: { PhotoRow* _tmp8_; -#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2228 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; -#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2228 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17298 "Photo.c" +#line 17423 "Photo.c" } -#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2228 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2228 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 17304 "Photo.c" - goto __catch339_database_error; +#line 17429 "Photo.c" + goto __catch351_database_error; } -#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2228 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2228 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2228 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17313 "Photo.c" +#line 17438 "Photo.c" } } } - goto __finally339; - __catch339_database_error: + goto __finally351; + __catch351_database_error: { GError* err = NULL; gchar* _tmp9_; gchar* _tmp10_; GError* _tmp11_; const gchar* _tmp12_; -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 2213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 2213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_; -#line 2213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = err; -#line 2213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->message; -#line 2213 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2213: Unable to update link state for %s: %s", _tmp10_, _tmp12_); -#line 2213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:2232: Unable to update link state for %s: %s", _tmp10_, _tmp12_); +#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp10_); -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17343 "Photo.c" +#line 17468 "Photo.c" } - __finally339: -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" + __finally351: +#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2226 "/home/jens/Source/shotwell/src/Photo.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 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17354 "Photo.c" +#line 17479 "Photo.c" } } @@ -17361,19 +17486,19 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { Photo * self; gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 2221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2240 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2240 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (event_id != NULL, FALSE); -#line 17367 "Photo.c" +#line 17492 "Photo.c" { PhotoRow* _tmp0_; gboolean _tmp13_ = FALSE; -#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17375 "Photo.c" +#line 17500 "Photo.c" { gboolean committed = FALSE; PhotoTable* _tmp1_; @@ -17384,70 +17509,70 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { gboolean _tmp6_; gboolean _tmp7_; gboolean _tmp8_; -#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->photo_id; -#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = *event_id; -#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_table_set_event (_tmp2_, &_tmp4_, &_tmp5_); -#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp7_; -#line 2225 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = committed; -#line 2225 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 17408 "Photo.c" +#line 17533 "Photo.c" PhotoRow* _tmp9_; EventID _tmp10_; -#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2245 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2245 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = *event_id; -#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2245 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_->event_id = _tmp10_; -#line 17417 "Photo.c" +#line 17542 "Photo.c" } -#line 2228 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2247 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; -#line 17421 "Photo.c" +#line 17546 "Photo.c" { PhotoRow* _tmp11_; -#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17428 "Photo.c" +#line 17553 "Photo.c" } -#line 2228 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2247 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17432 "Photo.c" +#line 17557 "Photo.c" } - __finally341: + __finally353: { PhotoRow* _tmp12_; -#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->row; -#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17441 "Photo.c" +#line 17566 "Photo.c" } -#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2241 "/home/jens/Source/shotwell/src/Photo.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 2222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2241 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp13_; -#line 17449 "Photo.c" +#line 17574 "Photo.c" } } @@ -17467,13 +17592,13 @@ static gchar* photo_real_to_string (DataObject* base) { gchar* _tmp17_; gchar* _tmp18_; gchar* _tmp19_; -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2251 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_is_master_baseline (self); -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp1_) { -#line 17475 "Photo.c" +#line 17600 "Photo.c" GFile* _tmp2_; GFile* _tmp3_; gchar* _tmp4_; @@ -17481,74 +17606,74 @@ static gchar* photo_real_to_string (DataObject* base) { gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_get_actual_file (self); -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = g_file_get_path (_tmp3_); -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = g_strconcat (" (", _tmp5_, NULL); -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_strconcat (_tmp7_, ")", NULL); -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp8_; -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp7_); -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp5_); -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 17507 "Photo.c" +#line 17632 "Photo.c" } else { gchar* _tmp9_; -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = g_strdup (""); -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp9_; -#line 17516 "Photo.c" +#line 17641 "Photo.c" } -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp10_); -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_.id; -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp11_); -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo_get_master_reader (self); -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_; -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = g_strdup_printf ("[%s] %s%s", _tmp13_, _tmp17_, _tmp0_); -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_; -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp17_); -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp15_); -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp13_); -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp19_; -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17550 "Photo.c" +#line 17675 "Photo.c" } @@ -17561,21 +17686,21 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) { Photo* _tmp2_; DataSource* _tmp14_; gboolean _tmp15_; -#line 2237 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2256 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2237 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2256 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE); -#line 2239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = source; -#line 2239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO) ? ((Photo*) _tmp0_) : NULL); -#line 2239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp1_; -#line 2240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2259 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo; -#line 2240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2259 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 17577 "Photo.c" +#line 17702 "Photo.c" PhotoID photo_id = {0}; PhotoID _tmp3_ = {0}; PhotoID other_photo_id = {0}; @@ -17583,66 +17708,66 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) { PhotoID _tmp5_ = {0}; gboolean _tmp6_ = FALSE; Photo* _tmp7_; -#line 2241 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2260 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp3_); -#line 2241 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2260 "/home/jens/Source/shotwell/src/Photo.vala" photo_id = _tmp3_; -#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo; -#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2261 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (_tmp4_, &_tmp5_); -#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2261 "/home/jens/Source/shotwell/src/Photo.vala" other_photo_id = _tmp5_; -#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo; -#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2263 "/home/jens/Source/shotwell/src/Photo.vala" if (self != _tmp7_) { -#line 17599 "Photo.c" +#line 17724 "Photo.c" PhotoID _tmp8_; gint64 _tmp9_; -#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_id; -#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_.id; -#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp9_ != PHOTO_ID_INVALID; -#line 17608 "Photo.c" +#line 17733 "Photo.c" } else { -#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; -#line 17612 "Photo.c" +#line 17737 "Photo.c" } -#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2263 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 17616 "Photo.c" +#line 17741 "Photo.c" PhotoID _tmp10_; gint64 _tmp11_; PhotoID _tmp12_; gint64 _tmp13_; -#line 2245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_id; -#line 2245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_.id; -#line 2245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = other_photo_id; -#line 2245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_.id; -#line 2245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2264 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp11_ != _tmp13_, "photo_id.id != other_photo_id.id"); -#line 17631 "Photo.c" +#line 17756 "Photo.c" } } -#line 2249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = source; -#line 2249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = DATA_SOURCE_CLASS (photo_parent_class)->equals (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), _tmp14_); -#line 2249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp15_; -#line 2249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 2249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17644 "Photo.c" +#line 17769 "Photo.c" } @@ -17662,196 +17787,196 @@ static void photo_file_exif_updated (Photo* self) { gboolean success = FALSE; gboolean _tmp37_; GError * _inner_error_ = NULL; -#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2272 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 2254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2273 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp0_; -#line 2256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2275 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 17672 "Photo.c" +#line 17797 "Photo.c" { GFileInfo* _tmp1_ = NULL; GFileInfo* _tmp2_; GFileInfo* _tmp3_; -#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2277 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = g_file_query_info (file, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); -#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2277 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp2_; -#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2277 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17683 "Photo.c" - goto __catch342_g_error; +#line 17808 "Photo.c" + goto __catch354_g_error; } -#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2277 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp1_; -#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2277 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2277 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2277 "/home/jens/Source/shotwell/src/Photo.vala" info = _tmp3_; -#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 17696 "Photo.c" +#line 17821 "Photo.c" } - goto __finally342; - __catch342_g_error: + goto __finally354; + __catch354_g_error: { GError* err = NULL; gchar* _tmp4_; gchar* _tmp5_; const gchar* _tmp6_; -#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 2261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 2261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 2261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = err->message; -#line 2261 "/home/jens/Source/shotwell/src/Photo.vala" - g_error ("Photo.vala:2261: Unable to read file information for %s: %s", _tmp5_, _tmp6_); -#line 2261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" + g_error ("Photo.vala:2280: Unable to read file information for %s: %s", _tmp5_, _tmp6_); +#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp5_); -#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17721 "Photo.c" +#line 17846 "Photo.c" } - __finally342: -#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" + __finally354: +#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2276 "/home/jens/Source/shotwell/src/Photo.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 2257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17736 "Photo.c" +#line 17861 "Photo.c" } -#line 2264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = info; -#line 2264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" g_file_info_get_modification_time (_tmp7_, &_tmp8_); -#line 2264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" timestamp = _tmp8_; -#line 2267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2286 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_file_interrogator_new (file, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL); -#line 2267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2286 "/home/jens/Source/shotwell/src/Photo.vala" interrogator = _tmp9_; -#line 17748 "Photo.c" +#line 17873 "Photo.c" { -#line 2269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2288 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (interrogator, &_inner_error_); -#line 2269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2288 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17754 "Photo.c" - goto __catch343_g_error; +#line 17879 "Photo.c" + goto __catch355_g_error; } } - goto __finally343; - __catch343_g_error: + goto __finally355; + __catch355_g_error: { GError* err = NULL; gchar* _tmp10_; gchar* _tmp11_; GError* _tmp12_; const gchar* _tmp13_; -#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2287 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2287 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 2271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = g_file_get_path (file); -#line 2271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 2271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = err; -#line 2271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_->message; -#line 2271 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2271: Unable to interrogate photo file %s: %s", _tmp11_, _tmp13_); -#line 2271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2290 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:2290: Unable to interrogate photo file %s: %s", _tmp11_, _tmp13_); +#line 2290 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp11_); -#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2287 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17784 "Photo.c" +#line 17909 "Photo.c" } - __finally343: -#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" + __finally355: +#line 2287 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2287 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2287 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2287 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2287 "/home/jens/Source/shotwell/src/Photo.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 2268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2287 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2287 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17801 "Photo.c" +#line 17926 "Photo.c" } -#line 2274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo_file_interrogator_get_detected_photo_information (interrogator); -#line 2274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2293 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp14_; -#line 2275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = detected; -#line 2275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_ == NULL) { -#line 2275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = TRUE; -#line 17813 "Photo.c" +#line 17938 "Photo.c" } else { gboolean _tmp17_; -#line 2275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_file_interrogator_get_is_photo_corrupted (interrogator); -#line 2275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp17_; -#line 17820 "Photo.c" +#line 17945 "Photo.c" } -#line 2275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 17824 "Photo.c" +#line 17949 "Photo.c" gchar* _tmp18_; gchar* _tmp19_; -#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_; -#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" - g_critical ("Photo.vala:2276: file_exif_updated: %s no longer an image", _tmp19_); -#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2295 "/home/jens/Source/shotwell/src/Photo.vala" + g_critical ("Photo.vala:2295: file_exif_updated: %s no longer an image", _tmp19_); +#line 2295 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp19_); -#line 2278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2297 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 2278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2297 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 2278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2297 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 2278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2297 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 2278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2297 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17845 "Photo.c" +#line 17970 "Photo.c" } { PhotoRow* _tmp20_; -#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->row; -#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17853 "Photo.c" +#line 17978 "Photo.c" { PhotoTable* _tmp21_; PhotoTable* _tmp22_; @@ -17868,96 +17993,96 @@ static void photo_file_exif_updated (Photo* self) { const gchar* _tmp33_; PhotoRow* _tmp34_; gboolean _tmp35_; -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_table_get_instance (); -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_; -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp23_); -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = info; -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = g_file_info_get_size (_tmp24_); -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = timestamp; -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_.tv_sec; -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = detected; -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp28_->md5; -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = detected; -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_->exif_md5; -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = detected; -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_->thumbnail_md5; -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = self->row; -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_table_master_exif_updated (_tmp22_, &_tmp23_, _tmp25_, _tmp27_, _tmp29_, _tmp31_, _tmp33_, _tmp34_); -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" success = _tmp35_; -#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp22_); -#line 17904 "Photo.c" +#line 18029 "Photo.c" } - __finally344: + __finally356: { PhotoRow* _tmp36_; -#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = self->row; -#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17913 "Photo.c" +#line 18038 "Photo.c" } -#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.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 2282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17931 "Photo.c" +#line 18056 "Photo.c" } } -#line 2287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = success; -#line 2287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp37_) { -#line 17938 "Photo.c" +#line 18063 "Photo.c" Alteration* _tmp38_; Alteration* _tmp39_; -#line 2288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = alteration_new_from_list ("metadata:exif,metadata:md5"); -#line 2288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp38_; -#line 2288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2307 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_); -#line 2288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2307 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp39_); -#line 17949 "Photo.c" +#line 18074 "Photo.c" } -#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2272 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2272 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2272 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2272 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 17959 "Photo.c" +#line 18084 "Photo.c" } @@ -17965,55 +18090,55 @@ static guint64 photo_real_get_filesize (MediaSource* base) { Photo * self; guint64 result = 0ULL; GError * _inner_error_ = NULL; -#line 2293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2312 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17969 "Photo.c" +#line 18094 "Photo.c" { PhotoRow* _tmp0_; guint64 _tmp5_ = 0ULL; -#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2313 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17977 "Photo.c" +#line 18102 "Photo.c" { BackingPhotoRow* _tmp1_; gint64 _tmp2_; -#line 2295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2314 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->backing_photo_row; -#line 2295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2314 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->filesize; -#line 2295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2314 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp2_; -#line 17987 "Photo.c" +#line 18112 "Photo.c" { PhotoRow* _tmp3_; -#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2313 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17994 "Photo.c" +#line 18119 "Photo.c" } -#line 2295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2314 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17998 "Photo.c" +#line 18123 "Photo.c" } - __finally345: + __finally357: { PhotoRow* _tmp4_; -#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2313 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18007 "Photo.c" +#line 18132 "Photo.c" } -#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2313 "/home/jens/Source/shotwell/src/Photo.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 2294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2313 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2313 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 18015 "Photo.c" +#line 18140 "Photo.c" } } @@ -18022,58 +18147,58 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { Photo * self; guint64 result = 0ULL; GError * _inner_error_ = NULL; -#line 2299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2318 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18026 "Photo.c" +#line 18151 "Photo.c" { PhotoRow* _tmp0_; guint64 _tmp6_ = 0ULL; -#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2319 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18034 "Photo.c" +#line 18159 "Photo.c" { PhotoRow* _tmp1_; BackingPhotoRow* _tmp2_; gint64 _tmp3_; -#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2320 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2320 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; -#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2320 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->filesize; -#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2320 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp3_; -#line 18047 "Photo.c" +#line 18172 "Photo.c" { PhotoRow* _tmp4_; -#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2319 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18054 "Photo.c" +#line 18179 "Photo.c" } -#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2320 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18058 "Photo.c" +#line 18183 "Photo.c" } - __finally346: + __finally358: { PhotoRow* _tmp5_; -#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2319 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18067 "Photo.c" +#line 18192 "Photo.c" } -#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2319 "/home/jens/Source/shotwell/src/Photo.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 2300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2319 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2319 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp6_; -#line 18075 "Photo.c" +#line 18200 "Photo.c" } } @@ -18081,55 +18206,55 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { guint64 photo_get_editable_filesize (Photo* self) { guint64 result = 0ULL; GError * _inner_error_ = NULL; -#line 2305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2324 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 18085 "Photo.c" +#line 18210 "Photo.c" { PhotoRow* _tmp0_; guint64 _tmp5_ = 0ULL; -#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2325 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2325 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18093 "Photo.c" +#line 18218 "Photo.c" { BackingPhotoRow* _tmp1_; gint64 _tmp2_; -#line 2307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->editable; -#line 2307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->filesize; -#line 2307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2326 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp2_; -#line 18103 "Photo.c" +#line 18228 "Photo.c" { PhotoRow* _tmp3_; -#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2325 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2325 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18110 "Photo.c" +#line 18235 "Photo.c" } -#line 2307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2326 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18114 "Photo.c" +#line 18239 "Photo.c" } - __finally347: + __finally359: { PhotoRow* _tmp4_; -#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2325 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2325 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18123 "Photo.c" +#line 18248 "Photo.c" } -#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2325 "/home/jens/Source/shotwell/src/Photo.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 2306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2325 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2325 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 18131 "Photo.c" +#line 18256 "Photo.c" } } @@ -18138,15 +18263,15 @@ static time_t photo_real_get_exposure_time (Dateable* base) { Photo * self; time_t result = 0; time_t _tmp0_; -#line 2311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2330 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2312 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2331 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->cached_exposure_time; -#line 2312 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2331 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 2312 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2331 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18148 "Photo.c" +#line 18273 "Photo.c" } @@ -18154,54 +18279,54 @@ static gchar* photo_real_get_basename (MediaSource* base) { Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; -#line 2315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2334 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18158 "Photo.c" +#line 18283 "Photo.c" { PhotoRow* _tmp0_; -#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18165 "Photo.c" +#line 18290 "Photo.c" { const gchar* _tmp1_; gchar* _tmp2_; -#line 2317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2336 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->file_title; -#line 2317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2336 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = g_strdup (_tmp1_); -#line 2317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2336 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 18175 "Photo.c" +#line 18300 "Photo.c" { PhotoRow* _tmp3_; -#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18182 "Photo.c" +#line 18307 "Photo.c" } -#line 2317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2336 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18186 "Photo.c" +#line 18311 "Photo.c" } - __finally348: + __finally360: { PhotoRow* _tmp4_; -#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18195 "Photo.c" +#line 18320 "Photo.c" } -#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2335 "/home/jens/Source/shotwell/src/Photo.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 2316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18203 "Photo.c" +#line 18328 "Photo.c" } } @@ -18210,57 +18335,57 @@ static gchar* photo_real_get_title (MediaSource* base) { Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; -#line 2321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2340 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18214 "Photo.c" +#line 18339 "Photo.c" { PhotoRow* _tmp0_; -#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18221 "Photo.c" +#line 18346 "Photo.c" { PhotoRow* _tmp1_; const gchar* _tmp2_; gchar* _tmp3_; -#line 2323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->title; -#line 2323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = g_strdup (_tmp2_); -#line 2323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2342 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 18234 "Photo.c" +#line 18359 "Photo.c" { PhotoRow* _tmp4_; -#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18241 "Photo.c" +#line 18366 "Photo.c" } -#line 2323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2342 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18245 "Photo.c" +#line 18370 "Photo.c" } - __finally349: + __finally361: { PhotoRow* _tmp5_; -#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18254 "Photo.c" +#line 18379 "Photo.c" } -#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.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 2322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18262 "Photo.c" +#line 18387 "Photo.c" } } @@ -18269,57 +18394,57 @@ static gchar* photo_real_get_comment (MediaSource* base) { Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; -#line 2327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2346 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18273 "Photo.c" +#line 18398 "Photo.c" { PhotoRow* _tmp0_; -#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18280 "Photo.c" +#line 18405 "Photo.c" { PhotoRow* _tmp1_; const gchar* _tmp2_; gchar* _tmp3_; -#line 2329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2348 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2348 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->comment; -#line 2329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2348 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = g_strdup (_tmp2_); -#line 2329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2348 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 18293 "Photo.c" +#line 18418 "Photo.c" { PhotoRow* _tmp4_; -#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18300 "Photo.c" +#line 18425 "Photo.c" } -#line 2329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2348 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18304 "Photo.c" +#line 18429 "Photo.c" } - __finally350: + __finally362: { PhotoRow* _tmp5_; -#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18313 "Photo.c" +#line 18438 "Photo.c" } -#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2347 "/home/jens/Source/shotwell/src/Photo.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 2328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18321 "Photo.c" +#line 18446 "Photo.c" } } @@ -18332,24 +18457,24 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) { gboolean committed = FALSE; gboolean _tmp18_; GError * _inner_error_ = NULL; -#line 2333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2352 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2353 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = title; -#line 2334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2353 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_source_prep_title (_tmp0_); -#line 2334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2353 "/home/jens/Source/shotwell/src/Photo.vala" new_title = _tmp1_; -#line 2336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2355 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 18344 "Photo.c" +#line 18469 "Photo.c" { PhotoRow* _tmp2_; -#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18351 "Photo.c" +#line 18476 "Photo.c" { const gchar* _tmp3_; PhotoRow* _tmp4_; @@ -18361,108 +18486,108 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) { const gchar* _tmp11_; gboolean _tmp12_; gboolean _tmp13_; -#line 2338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2357 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = new_title; -#line 2338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2357 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2357 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->title; -#line 2338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2357 "/home/jens/Source/shotwell/src/Photo.vala" if (g_strcmp0 (_tmp3_, _tmp5_) == 0) { -#line 18371 "Photo.c" +#line 18496 "Photo.c" { PhotoRow* _tmp6_; -#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18378 "Photo.c" +#line 18503 "Photo.c" } -#line 2339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_title); -#line 2339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18384 "Photo.c" +#line 18509 "Photo.c" } -#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_table_get_instance (); -#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->photo_id; -#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = new_title; -#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_table_set_title (_tmp8_, &_tmp10_, _tmp11_); -#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp12_; -#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp8_); -#line 2342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2361 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = committed; -#line 2342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2361 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 18406 "Photo.c" +#line 18531 "Photo.c" PhotoRow* _tmp14_; const gchar* _tmp15_; gchar* _tmp16_; -#line 2343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = new_title; -#line 2343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = g_strdup (_tmp15_); -#line 2343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2362 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp14_->title); -#line 2343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->title = _tmp16_; -#line 18420 "Photo.c" +#line 18545 "Photo.c" } } - __finally351: + __finally363: { PhotoRow* _tmp17_; -#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->row; -#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18430 "Photo.c" +#line 18555 "Photo.c" } -#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_title); -#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.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 2337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18442 "Photo.c" +#line 18567 "Photo.c" } } -#line 2346 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2365 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = committed; -#line 2346 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2365 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_) { -#line 18449 "Photo.c" +#line 18574 "Photo.c" Alteration* _tmp19_; Alteration* _tmp20_; -#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2366 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = alteration_new ("metadata", "name"); -#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2366 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2366 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_); -#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2366 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp20_); -#line 18460 "Photo.c" +#line 18585 "Photo.c" } -#line 2333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2352 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_title); -#line 18464 "Photo.c" +#line 18589 "Photo.c" } @@ -18475,24 +18600,24 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) gboolean committed = FALSE; gboolean _tmp19_; GError * _inner_error_ = NULL; -#line 2350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = comment; -#line 2351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_source_prep_comment (_tmp0_); -#line 2351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" new_comment = _tmp1_; -#line 2353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 18487 "Photo.c" +#line 18612 "Photo.c" { PhotoRow* _tmp2_; -#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18494 "Photo.c" +#line 18619 "Photo.c" { const gchar* _tmp3_; PhotoRow* _tmp4_; @@ -18504,123 +18629,123 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) const gchar* _tmp11_; gboolean _tmp12_; gboolean _tmp13_; -#line 2355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = new_comment; -#line 2355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->comment; -#line 2355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" if (g_strcmp0 (_tmp3_, _tmp5_) == 0) { -#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2375 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 18516 "Photo.c" +#line 18641 "Photo.c" { PhotoRow* _tmp6_; -#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18523 "Photo.c" +#line 18648 "Photo.c" } -#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2375 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_comment); -#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2375 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18529 "Photo.c" +#line 18654 "Photo.c" } -#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2377 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_table_get_instance (); -#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2377 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2377 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2377 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->photo_id; -#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2377 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = new_comment; -#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2377 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_table_set_comment (_tmp8_, &_tmp10_, _tmp11_); -#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2377 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp12_; -#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2377 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp8_); -#line 2359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = committed; -#line 2359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2378 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 18551 "Photo.c" +#line 18676 "Photo.c" PhotoRow* _tmp14_; const gchar* _tmp15_; gchar* _tmp16_; -#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2379 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2379 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = new_comment; -#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2379 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = g_strdup (_tmp15_); -#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2379 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp14_->comment); -#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2379 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->comment = _tmp16_; -#line 18565 "Photo.c" +#line 18690 "Photo.c" } } - __finally352: + __finally364: { PhotoRow* _tmp17_; -#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->row; -#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18575 "Photo.c" +#line 18700 "Photo.c" } -#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18579 "Photo.c" +#line 18704 "Photo.c" gboolean _tmp18_ = FALSE; -#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_comment); -#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.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 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp18_; -#line 18589 "Photo.c" +#line 18714 "Photo.c" } } -#line 2363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = committed; -#line 2363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2382 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_) { -#line 18596 "Photo.c" +#line 18721 "Photo.c" Alteration* _tmp20_; Alteration* _tmp21_; -#line 2364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = alteration_new ("metadata", "comment"); -#line 2364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_; -#line 2364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_); -#line 2364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp21_); -#line 18607 "Photo.c" +#line 18732 "Photo.c" } -#line 2366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2385 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; -#line 2366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2385 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_comment); -#line 2366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2385 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18615 "Photo.c" +#line 18740 "Photo.c" } static gpointer _g_error_copy0 (gpointer self) { -#line 2376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2395 "/home/jens/Source/shotwell/src/Photo.vala" return self ? g_error_copy (self) : NULL; -#line 18622 "Photo.c" +#line 18747 "Photo.c" } @@ -18628,20 +18753,20 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { GError* dberr = NULL; GError* _tmp13_; GError * _inner_error_ = NULL; -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2388 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2388 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (import_id != NULL); -#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2389 "/home/jens/Source/shotwell/src/Photo.vala" dberr = NULL; -#line 18636 "Photo.c" +#line 18761 "Photo.c" { PhotoRow* _tmp0_; -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18643 "Photo.c" +#line 18768 "Photo.c" { { PhotoTable* _tmp1_; @@ -18651,158 +18776,158 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { ImportID _tmp5_; PhotoRow* _tmp7_; ImportID _tmp8_; -#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->photo_id; -#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = *import_id; -#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2392 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_set_import_id (_tmp2_, &_tmp4_, &_tmp5_, &_inner_error_); -#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2392 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2392 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2392 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 18671 "Photo.c" - goto __catch354_database_error; +#line 18796 "Photo.c" + goto __catch366_database_error; } { PhotoRow* _tmp6_; -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18680 "Photo.c" +#line 18805 "Photo.c" } -#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2392 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); -#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2392 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2392 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2392 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18690 "Photo.c" +#line 18815 "Photo.c" } -#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2393 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2393 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = *import_id; -#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2393 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_->import_id = _tmp8_; -#line 18698 "Photo.c" +#line 18823 "Photo.c" } - goto __finally354; - __catch354_database_error: + goto __finally366; + __catch366_database_error: { GError* err = NULL; GError* _tmp9_; GError* _tmp10_; -#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 2376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2395 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = err; -#line 2376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2395 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _g_error_copy0 (_tmp9_); -#line 2376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2395 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); -#line 2376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2395 "/home/jens/Source/shotwell/src/Photo.vala" dberr = _tmp10_; -#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 18720 "Photo.c" +#line 18845 "Photo.c" } - __finally354: -#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" + __finally366: +#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18725 "Photo.c" +#line 18850 "Photo.c" { PhotoRow* _tmp11_; -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18732 "Photo.c" +#line 18857 "Photo.c" } -#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); -#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18742 "Photo.c" +#line 18867 "Photo.c" } } - __finally353: + __finally365: { PhotoRow* _tmp12_; -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->row; -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18752 "Photo.c" +#line 18877 "Photo.c" } -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.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 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18764 "Photo.c" +#line 18889 "Photo.c" } } -#line 2380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = dberr; -#line 2380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ == NULL) { -#line 18771 "Photo.c" +#line 18896 "Photo.c" Alteration* _tmp14_; Alteration* _tmp15_; -#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2400 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = alteration_new ("metadata", "import-id"); -#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2400 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_; -#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2400 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_); -#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2400 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp15_); -#line 18782 "Photo.c" +#line 18907 "Photo.c" } else { gchar* _tmp16_; gchar* _tmp17_; GError* _tmp18_; const gchar* _tmp19_; -#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = dberr; -#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->message; -#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2383: Unable to write import ID for %s: %s", _tmp17_, _tmp19_); -#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:2402: Unable to write import ID for %s: %s", _tmp17_, _tmp19_); +#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp17_); -#line 18800 "Photo.c" +#line 18925 "Photo.c" } -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2388 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); -#line 18804 "Photo.c" +#line 18929 "Photo.c" } @@ -18825,155 +18950,155 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error GFile* _tmp16_; const gchar* _tmp22_; GError * _inner_error_ = NULL; -#line 2386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2405 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2387 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2406 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_source_reader (self); -#line 2387 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2406 "/home/jens/Source/shotwell/src/Photo.vala" source = _tmp0_; -#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2409 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = source; -#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2409 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2409 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2409 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 18841 "Photo.c" +#line 18966 "Photo.c" PhotoFileReader* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; const gchar* _tmp7_; -#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2410 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = source; -#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2410 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2410 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2391: No photo file writer available for %s", _tmp6_); -#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2410 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:2410: No photo file writer available for %s", _tmp6_); +#line 2410 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp6_); -#line 2393 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2412 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = title; -#line 2393 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2412 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_); -#line 2395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2414 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2414 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18864 "Photo.c" +#line 18989 "Photo.c" } -#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2417 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = source; -#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2417 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_); -#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2417 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp9_; -#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2417 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2417 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2417 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2417 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18880 "Photo.c" +#line 19005 "Photo.c" } -#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2418 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = metadata; -#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2418 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = title; -#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2418 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_title (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2420 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = source; -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2420 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_); -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2420 "/home/jens/Source/shotwell/src/Photo.vala" writer = _tmp13_; -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2420 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2420 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2420 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2420 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2420 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18904 "Photo.c" +#line 19029 "Photo.c" } -#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2421 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = source; -#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2421 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2421 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2421 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_title"); -#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2421 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp16_); -#line 18916 "Photo.c" +#line 19041 "Photo.c" { PhotoFileMetadataWriter* _tmp17_; PhotoMetadata* _tmp18_; -#line 2404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2423 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = writer; -#line 2404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2423 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = metadata; -#line 2404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2423 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_); -#line 2404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2423 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18928 "Photo.c" - goto __finally355; +#line 19053 "Photo.c" + goto __finally367; } } - __finally355: + __finally367: { PhotoFileReader* _tmp19_; GFile* _tmp20_; GFile* _tmp21_; -#line 2406 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2425 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = source; -#line 2406 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2425 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2406 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2425 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_; -#line 2406 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2425 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_unblacklist_file (_tmp21_); -#line 2406 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2425 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp21_); -#line 18947 "Photo.c" +#line 19072 "Photo.c" } -#line 2403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2422 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2422 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2422 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 2403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2422 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2422 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2422 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18961 "Photo.c" +#line 19086 "Photo.c" } -#line 2409 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2428 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = title; -#line 2409 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2428 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_); -#line 2411 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_exif_updated (self); -#line 2386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2405 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 2386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2405 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2405 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 18975 "Photo.c" +#line 19100 "Photo.c" } @@ -18996,155 +19121,155 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e GFile* _tmp16_; const gchar* _tmp22_; GError * _inner_error_ = NULL; -#line 2414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2433 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2434 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_source_reader (self); -#line 2415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2434 "/home/jens/Source/shotwell/src/Photo.vala" source = _tmp0_; -#line 2418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = source; -#line 2418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2437 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 19012 "Photo.c" +#line 19137 "Photo.c" PhotoFileReader* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; const gchar* _tmp7_; -#line 2419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = source; -#line 2419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 2419 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2419: No photo file writer available for %s", _tmp6_); -#line 2419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2438 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:2438: No photo file writer available for %s", _tmp6_); +#line 2438 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp6_); -#line 2421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2440 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = comment; -#line 2421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2440 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_); -#line 2423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2442 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2442 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19035 "Photo.c" +#line 19160 "Photo.c" } -#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = source; -#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_); -#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp9_; -#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19051 "Photo.c" +#line 19176 "Photo.c" } -#line 2427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2446 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = metadata; -#line 2427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2446 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = comment; -#line 2427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2446 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_comment (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2448 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = source; -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2448 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_); -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2448 "/home/jens/Source/shotwell/src/Photo.vala" writer = _tmp13_; -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2448 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2448 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2448 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2448 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2448 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19075 "Photo.c" +#line 19200 "Photo.c" } -#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2449 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = source; -#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2449 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2449 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2449 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_comment"); -#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2449 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp16_); -#line 19087 "Photo.c" +#line 19212 "Photo.c" { PhotoFileMetadataWriter* _tmp17_; PhotoMetadata* _tmp18_; -#line 2432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2451 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = writer; -#line 2432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2451 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = metadata; -#line 2432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2451 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_); -#line 2432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2451 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 19099 "Photo.c" - goto __finally356; +#line 19224 "Photo.c" + goto __finally368; } } - __finally356: + __finally368: { PhotoFileReader* _tmp19_; GFile* _tmp20_; GFile* _tmp21_; -#line 2434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2453 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = source; -#line 2434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2453 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2453 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_; -#line 2434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2453 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_unblacklist_file (_tmp21_); -#line 2434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2453 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp21_); -#line 19118 "Photo.c" +#line 19243 "Photo.c" } -#line 2431 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2450 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2431 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2450 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2431 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2450 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 2431 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2450 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2431 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2450 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2431 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2450 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19132 "Photo.c" +#line 19257 "Photo.c" } -#line 2437 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2456 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = comment; -#line 2437 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2456 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_); -#line 2439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2458 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_exif_updated (self); -#line 2414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2433 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 2414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2433 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2433 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 19146 "Photo.c" +#line 19271 "Photo.c" } @@ -19153,16 +19278,16 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { gboolean committed = FALSE; gboolean _tmp12_; GError * _inner_error_ = NULL; -#line 2442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2461 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 19157 "Photo.c" +#line 19282 "Photo.c" { PhotoRow* _tmp0_; -#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2463 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2463 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19164 "Photo.c" +#line 19289 "Photo.c" { PhotoTable* _tmp1_; PhotoTable* _tmp2_; @@ -19171,79 +19296,79 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { time_t _tmp5_; gboolean _tmp6_; gboolean _tmp7_; -#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->photo_id; -#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = time; -#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_); -#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2464 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp6_; -#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2464 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 2446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2465 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = committed; -#line 2446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2465 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { -#line 19193 "Photo.c" +#line 19318 "Photo.c" PhotoRow* _tmp8_; time_t _tmp9_; time_t _tmp10_; -#line 2447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; -#line 2447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = time; -#line 2447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_->exposure_time = _tmp9_; -#line 2448 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = time; -#line 2448 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2467 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->cached_exposure_time = _tmp10_; -#line 19207 "Photo.c" +#line 19332 "Photo.c" } } - __finally357: + __finally369: { PhotoRow* _tmp11_; -#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2463 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2463 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19217 "Photo.c" +#line 19342 "Photo.c" } -#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2463 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2463 "/home/jens/Source/shotwell/src/Photo.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 2444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2463 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2463 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19227 "Photo.c" +#line 19352 "Photo.c" } } -#line 2452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = committed; -#line 2452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 19234 "Photo.c" +#line 19359 "Photo.c" Alteration* _tmp13_; Alteration* _tmp14_; -#line 2453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = alteration_new ("metadata", "exposure-time"); -#line 2453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_; -#line 2453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_); -#line 2453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp14_); -#line 19245 "Photo.c" +#line 19370 "Photo.c" } } @@ -19269,161 +19394,161 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro GFile* _tmp18_; time_t _tmp24_; GError * _inner_error_ = NULL; -#line 2456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2475 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2476 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_source_reader (self); -#line 2457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2476 "/home/jens/Source/shotwell/src/Photo.vala" source = _tmp0_; -#line 2460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = source; -#line 2460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2479 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 19285 "Photo.c" +#line 19410 "Photo.c" PhotoFileReader* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; time_t _tmp7_; -#line 2461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = source; -#line 2461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 2461 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2461: No photo file writer available for %s", _tmp6_); -#line 2461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2480 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:2480: No photo file writer available for %s", _tmp6_); +#line 2480 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp6_); -#line 2463 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2482 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = time; -#line 2463 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2482 "/home/jens/Source/shotwell/src/Photo.vala" dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp7_); -#line 2465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2484 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2484 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19308 "Photo.c" +#line 19433 "Photo.c" } -#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = source; -#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_); -#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2487 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp9_; -#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2487 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2487 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2487 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2487 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19324 "Photo.c" +#line 19449 "Photo.c" } -#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2488 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = metadata; -#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2488 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = time; -#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2488 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = metadata_date_time_new (_tmp11_); -#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2488 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2488 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_exposure_date_time (_tmp10_, _tmp13_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2488 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (_tmp13_); -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2490 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = source; -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2490 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_file_reader_create_metadata_writer (_tmp14_, &_inner_error_); -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2490 "/home/jens/Source/shotwell/src/Photo.vala" writer = _tmp15_; -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2490 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2490 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2490 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2490 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2490 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19354 "Photo.c" +#line 19479 "Photo.c" } -#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2491 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = source; -#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2491 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2491 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_; -#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2491 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_blacklist_file (_tmp18_, "Photo.set_exposure_time_persistent"); -#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2491 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp18_); -#line 19366 "Photo.c" +#line 19491 "Photo.c" { PhotoFileMetadataWriter* _tmp19_; PhotoMetadata* _tmp20_; -#line 2474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2493 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = writer; -#line 2474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2493 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = metadata; -#line 2474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2493 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp19_, _tmp20_, &_inner_error_); -#line 2474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2493 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 19378 "Photo.c" - goto __finally358; +#line 19503 "Photo.c" + goto __finally370; } } - __finally358: + __finally370: { PhotoFileReader* _tmp21_; GFile* _tmp22_; GFile* _tmp23_; -#line 2476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2495 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = source; -#line 2476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2495 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2495 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_; -#line 2476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2495 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_unblacklist_file (_tmp23_); -#line 2476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2495 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp23_); -#line 19397 "Photo.c" +#line 19522 "Photo.c" } -#line 2473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2492 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2492 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2492 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 2473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2492 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2492 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2492 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19411 "Photo.c" +#line 19536 "Photo.c" } -#line 2479 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = time; -#line 2479 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2498 "/home/jens/Source/shotwell/src/Photo.vala" dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp24_); -#line 2481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2500 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_exif_updated (self); -#line 2456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2475 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 2456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2475 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2475 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 19425 "Photo.c" +#line 19550 "Photo.c" } @@ -19450,39 +19575,39 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo gboolean _tmp11_; PhotoException _tmp22_; gboolean _tmp23_; -#line 2497 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2516 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2518 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_raw_dimensions (self, &_tmp0_); -#line 2499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2518 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims = _tmp0_; -#line 2502 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2521 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = disallowed_steps; -#line 2502 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2521 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_exception_allows (_tmp1_, PHOTO_EXCEPTION_ORIENTATION); -#line 2502 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2521 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 19464 "Photo.c" +#line 19589 "Photo.c" Orientation ori_tmp = 0; Orientation _tmp3_; Orientation _tmp4_; -#line 2503 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2522 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_orientation (self); -#line 2503 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2522 "/home/jens/Source/shotwell/src/Photo.vala" ori_tmp = _tmp3_; -#line 2506 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2525 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = ori_tmp; -#line 2506 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2525 "/home/jens/Source/shotwell/src/Photo.vala" switch (_tmp4_) { -#line 2506 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2525 "/home/jens/Source/shotwell/src/Photo.vala" case ORIENTATION_LEFT_TOP: -#line 2506 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2525 "/home/jens/Source/shotwell/src/Photo.vala" case ORIENTATION_RIGHT_TOP: -#line 2506 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2525 "/home/jens/Source/shotwell/src/Photo.vala" case ORIENTATION_LEFT_BOTTOM: -#line 2506 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2525 "/home/jens/Source/shotwell/src/Photo.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 19484 "Photo.c" +#line 19609 "Photo.c" { gint width_tmp = 0; Dimensions _tmp5_; @@ -19490,41 +19615,41 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo Dimensions _tmp7_; gint _tmp8_; gint _tmp9_; -#line 2512 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = returned_dims; -#line 2512 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_.width; -#line 2512 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" width_tmp = _tmp6_; -#line 2514 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2533 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = returned_dims; -#line 2514 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2533 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_.height; -#line 2514 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2533 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims.width = _tmp8_; -#line 2515 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2534 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = width_tmp; -#line 2515 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2534 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims.height = _tmp9_; -#line 2516 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2535 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 19510 "Photo.c" +#line 19635 "Photo.c" } default: { -#line 2520 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2539 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 19516 "Photo.c" +#line 19641 "Photo.c" } } } -#line 2525 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2544 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = disallowed_steps; -#line 2525 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2544 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_STRAIGHTEN); -#line 2525 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2544 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 19526 "Photo.c" +#line 19651 "Photo.c" gdouble x_size = 0.0; gdouble y_size = 0.0; gdouble angle = 0.0; @@ -19538,71 +19663,71 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo gdouble _tmp19_ = 0.0; gdouble _tmp20_; gdouble _tmp21_; -#line 2527 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2546 "/home/jens/Source/shotwell/src/Photo.vala" angle = 0.0; -#line 2529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2548 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_straighten (self, &_tmp12_); -#line 2529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2548 "/home/jens/Source/shotwell/src/Photo.vala" angle = _tmp12_; -#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = returned_dims; -#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_.width; -#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = returned_dims; -#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_.height; -#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = angle; -#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2550 "/home/jens/Source/shotwell/src/Photo.vala" compute_arb_rotated_size ((gdouble) _tmp14_, (gdouble) _tmp16_, _tmp17_, &_tmp18_, &_tmp19_); -#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2550 "/home/jens/Source/shotwell/src/Photo.vala" x_size = _tmp18_; -#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2550 "/home/jens/Source/shotwell/src/Photo.vala" y_size = _tmp19_; -#line 2533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = x_size; -#line 2533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2552 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims.width = (gint) _tmp20_; -#line 2534 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = y_size; -#line 2534 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2553 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims.height = (gint) _tmp21_; -#line 19570 "Photo.c" +#line 19695 "Photo.c" } -#line 2538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = disallowed_steps; -#line 2538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo_exception_allows (_tmp22_, PHOTO_EXCEPTION_CROP); -#line 2538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_) { -#line 19578 "Photo.c" +#line 19703 "Photo.c" Box crop = {0}; PhotoException _tmp24_; Box _tmp25_ = {0}; gboolean _tmp26_; -#line 2540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2559 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = disallowed_steps; -#line 2540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2559 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = photo_get_crop (self, &_tmp25_, _tmp24_); -#line 2540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2559 "/home/jens/Source/shotwell/src/Photo.vala" crop = _tmp25_; -#line 2540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2559 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp26_) { -#line 19591 "Photo.c" +#line 19716 "Photo.c" Dimensions _tmp27_ = {0}; -#line 2541 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2560 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&crop, &_tmp27_); -#line 2541 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2560 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims = _tmp27_; -#line 19597 "Photo.c" +#line 19722 "Photo.c" } } -#line 2544 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2563 "/home/jens/Source/shotwell/src/Photo.vala" *result = returned_dims; -#line 2544 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2563 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19604 "Photo.c" +#line 19729 "Photo.c" } @@ -19613,114 +19738,114 @@ static void photo_locked_create_adjustments_from_data (Photo* self) { KeyValueMap* _tmp2_; PixelTransformationBundle* _tmp6_; PixelTransformer* _tmp7_; -#line 2548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2567 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2549 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2568 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = pixel_transformation_bundle_new (); -#line 2549 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2568 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); -#line 2549 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2568 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = _tmp0_; -#line 2551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2570 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_transformation (self, "adjustments"); -#line 2551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2570 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp1_; -#line 2552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map; -#line 2552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 19631 "Photo.c" +#line 19756 "Photo.c" PixelTransformationBundle* _tmp3_; -#line 2553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->adjustments; -#line 2553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2572 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformation_bundle_set_to_identity (_tmp3_); -#line 19637 "Photo.c" +#line 19762 "Photo.c" } else { PixelTransformationBundle* _tmp4_; KeyValueMap* _tmp5_; -#line 2555 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->adjustments; -#line 2555 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = map; -#line 2555 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2574 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformation_bundle_load (_tmp4_, _tmp5_); -#line 19647 "Photo.c" +#line 19772 "Photo.c" } -#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2576 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->adjustments; -#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2576 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = pixel_transformation_bundle_generate_transformer (_tmp6_); -#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2576 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); -#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2576 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = _tmp7_; -#line 2548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2567 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 19659 "Photo.c" +#line 19784 "Photo.c" } PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { PixelTransformationBundle* result = NULL; GError * _inner_error_ = NULL; -#line 2561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2580 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 19668 "Photo.c" +#line 19793 "Photo.c" { PhotoRow* _tmp0_; -#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19675 "Photo.c" +#line 19800 "Photo.c" { PixelTransformationBundle* _tmp1_; PixelTransformationBundle* _tmp2_; PixelTransformationBundle* _tmp3_; -#line 2563 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2582 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->adjustments; -#line 2563 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2582 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 2564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2583 "/home/jens/Source/shotwell/src/Photo.vala" photo_locked_create_adjustments_from_data (self); -#line 19686 "Photo.c" +#line 19811 "Photo.c" } -#line 2566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->adjustments; -#line 2566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = pixel_transformation_bundle_copy (_tmp2_); -#line 2566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2585 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 19694 "Photo.c" +#line 19819 "Photo.c" { PhotoRow* _tmp4_; -#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19701 "Photo.c" +#line 19826 "Photo.c" } -#line 2566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2585 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19705 "Photo.c" +#line 19830 "Photo.c" } - __finally359: + __finally371: { PhotoRow* _tmp5_; -#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19714 "Photo.c" +#line 19839 "Photo.c" } -#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2581 "/home/jens/Source/shotwell/src/Photo.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 2562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2581 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2581 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 19722 "Photo.c" +#line 19847 "Photo.c" } } @@ -19728,63 +19853,63 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { PixelTransformer* photo_get_pixel_transformer (Photo* self) { PixelTransformer* result = NULL; GError * _inner_error_ = NULL; -#line 2570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2589 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 19732 "Photo.c" +#line 19857 "Photo.c" { PhotoRow* _tmp0_; -#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19739 "Photo.c" +#line 19864 "Photo.c" { PixelTransformer* _tmp1_; PixelTransformer* _tmp2_; PixelTransformer* _tmp3_; -#line 2572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->transformer; -#line 2572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2591 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 2573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" photo_locked_create_adjustments_from_data (self); -#line 19750 "Photo.c" +#line 19875 "Photo.c" } -#line 2575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->transformer; -#line 2575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = pixel_transformer_copy (_tmp2_); -#line 2575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2594 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 19758 "Photo.c" +#line 19883 "Photo.c" { PhotoRow* _tmp4_; -#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19765 "Photo.c" +#line 19890 "Photo.c" } -#line 2575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2594 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19769 "Photo.c" +#line 19894 "Photo.c" } - __finally360: + __finally372: { PhotoRow* _tmp5_; -#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19778 "Photo.c" +#line 19903 "Photo.c" } -#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2590 "/home/jens/Source/shotwell/src/Photo.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 2571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 19786 "Photo.c" +#line 19911 "Photo.c" } } @@ -19792,15 +19917,15 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { gboolean photo_has_color_adjustments (Photo* self) { gboolean result = FALSE; gboolean _tmp0_; -#line 2579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2598 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_has_transformation (self, "adjustments"); -#line 2580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 2580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19802 "Photo.c" +#line 19927 "Photo.c" } @@ -19811,25 +19936,25 @@ PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformatio PixelTransformationType _tmp2_; PixelTransformation* _tmp3_; PixelTransformation* _tmp4_; -#line 2583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2602 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2603 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_color_adjustments (self); -#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2603 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2603 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = type; -#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2603 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = pixel_transformation_bundle_get_transformation (_tmp1_, _tmp2_); -#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2603 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2603 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp1_); -#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2603 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2603 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19831 "Photo.c" +#line 19956 "Photo.c" } @@ -19842,141 +19967,141 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad gboolean committed = FALSE; gboolean _tmp39_; GError * _inner_error_ = NULL; -#line 2587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2606 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2606 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_adjustments)); -#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = new_adjustments; -#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = pixel_transformation_bundle_is_identity (_tmp0_); -#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 19854 "Photo.c" +#line 19979 "Photo.c" gboolean _result_ = FALSE; gboolean _tmp5_; { PhotoRow* _tmp2_; -#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19863 "Photo.c" +#line 19988 "Photo.c" { gboolean _tmp3_; -#line 2593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_remove_transformation (self, "adjustments"); -#line 2593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2612 "/home/jens/Source/shotwell/src/Photo.vala" _result_ = _tmp3_; -#line 2594 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); -#line 2594 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = NULL; -#line 2595 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2614 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); -#line 2595 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2614 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = NULL; -#line 19878 "Photo.c" +#line 20003 "Photo.c" } - __finally361: + __finally373: { PhotoRow* _tmp4_; -#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19887 "Photo.c" +#line 20012 "Photo.c" } -#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2611 "/home/jens/Source/shotwell/src/Photo.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 2592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19897 "Photo.c" +#line 20022 "Photo.c" } } -#line 2598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _result_; -#line 2598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2617 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 19904 "Photo.c" +#line 20029 "Photo.c" Alteration* _tmp6_; Alteration* _tmp7_; -#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = alteration_new ("image", "color-adjustments"); -#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2618 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp7_); -#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2618 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp7_); -#line 19915 "Photo.c" +#line 20040 "Photo.c" } -#line 2601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2620 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19919 "Photo.c" +#line 20044 "Photo.c" } -#line 2605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = new_adjustments; -#line 2605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = pixel_transformation_bundle_save (_tmp8_, "adjustments"); -#line 2605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2624 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp9_; -#line 19927 "Photo.c" +#line 20052 "Photo.c" { PhotoRow* _tmp10_; -#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2627 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->row; -#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2627 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19934 "Photo.c" +#line 20059 "Photo.c" { gboolean _tmp11_ = FALSE; PixelTransformer* _tmp12_; KeyValueMap* _tmp36_; gboolean _tmp37_; -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->transformer; -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_ == NULL) { -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; -#line 19946 "Photo.c" +#line 20071 "Photo.c" } else { PixelTransformationBundle* _tmp13_; -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->adjustments; -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp13_ == NULL; -#line 19953 "Photo.c" +#line 20078 "Photo.c" } -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 19957 "Photo.c" +#line 20082 "Photo.c" PixelTransformationBundle* _tmp14_; PixelTransformationBundle* _tmp15_; PixelTransformationBundle* _tmp16_; PixelTransformer* _tmp17_; -#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2630 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = new_adjustments; -#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2630 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = pixel_transformation_bundle_copy (_tmp14_); -#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2630 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); -#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2630 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = _tmp15_; -#line 2612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2631 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = new_adjustments; -#line 2612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2631 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = pixel_transformation_bundle_generate_transformer (_tmp16_); -#line 2612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2631 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); -#line 2612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2631 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = _tmp17_; -#line 19978 "Photo.c" +#line 20103 "Photo.c" } else { PixelTransformationBundle* _tmp34_; PixelTransformationBundle* _tmp35_; @@ -19987,23 +20112,23 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad GeeIterable* _tmp20_; GeeIterator* _tmp21_; GeeIterator* _tmp22_; -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = new_adjustments; -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = pixel_transformation_bundle_get_transformations (_tmp18_); -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = gee_iterable_iterator (_tmp20_); -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_; -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp20_); -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _transformation_it = _tmp22_; -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 20005 "Photo.c" +#line 20130 "Photo.c" GeeIterator* _tmp23_; gboolean _tmp24_; PixelTransformation* transformation = NULL; @@ -20016,108 +20141,108 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad PixelTransformation* _tmp31_; PixelTransformation* _tmp32_; PixelTransformation* _tmp33_; -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _transformation_it; -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = gee_iterator_next (_tmp23_); -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp24_) { -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 20026 "Photo.c" +#line 20151 "Photo.c" } -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _transformation_it; -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = gee_iterator_get (_tmp25_); -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" transformation = (PixelTransformation*) _tmp26_; -#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = self->priv->transformer; -#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = self->priv->adjustments; -#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = transformation; -#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = pixel_transformation_get_transformation_type (_tmp29_); -#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = pixel_transformation_bundle_get_transformation (_tmp28_, _tmp30_); -#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_; -#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = transformation; -#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2635 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformer_replace_transformation (_tmp27_, _tmp32_, _tmp33_); -#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2635 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_unref0 (_tmp32_); -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_unref0 (transformation); -#line 20054 "Photo.c" +#line 20179 "Photo.c" } -#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_transformation_it); -#line 20058 "Photo.c" +#line 20183 "Photo.c" } -#line 2621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = new_adjustments; -#line 2621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = pixel_transformation_bundle_copy (_tmp34_); -#line 2621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2640 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); -#line 2621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2640 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = _tmp35_; -#line 20068 "Photo.c" +#line 20193 "Photo.c" } -#line 2624 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = map; -#line 2624 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = photo_set_transformation (self, _tmp36_); -#line 2624 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp37_; -#line 20076 "Photo.c" +#line 20201 "Photo.c" } - __finally362: + __finally374: { PhotoRow* _tmp38_; -#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2627 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = self->row; -#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2627 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20085 "Photo.c" +#line 20210 "Photo.c" } -#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2627 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2627 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2627 "/home/jens/Source/shotwell/src/Photo.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 2608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2627 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2627 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20097 "Photo.c" +#line 20222 "Photo.c" } } -#line 2627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2646 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = committed; -#line 2627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2646 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp39_) { -#line 20104 "Photo.c" +#line 20229 "Photo.c" Alteration* _tmp40_; Alteration* _tmp41_; -#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = alteration_new ("image", "color-adjustments"); -#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_; -#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp41_); -#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp41_); -#line 20115 "Photo.c" +#line 20240 "Photo.c" } -#line 2587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2606 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 20119 "Photo.c" +#line 20244 "Photo.c" } @@ -20125,9 +20250,9 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { Photo * self; PhotoMetadata* result = NULL; GError * _inner_error_ = NULL; -#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2651 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 20129 "Photo.c" +#line 20254 "Photo.c" { PhotoMetadata* _tmp0_ = NULL; PhotoFileReader* _tmp1_; @@ -20135,67 +20260,67 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { PhotoMetadata* _tmp3_; PhotoMetadata* _tmp4_; PhotoMetadata* _tmp5_; -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_source_reader (self); -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_reader_read_metadata (_tmp2_, &_inner_error_); -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp2_); -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp4_; -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20151 "Photo.c" - goto __catch363_g_error; +#line 20276 "Photo.c" + goto __catch375_g_error; } -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp0_; -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (_tmp0_); -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20164 "Photo.c" +#line 20289 "Photo.c" } - goto __finally363; - __catch363_g_error: + goto __finally375; + __catch375_g_error: { GError* err = NULL; GError* _tmp6_; const gchar* _tmp7_; -#line 2633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2652 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 2633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2652 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 2636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2655 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = err; -#line 2636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2655 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->message; -#line 2636 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2636: Unable to load metadata: %s", _tmp7_); -#line 2638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2655 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:2655: Unable to load metadata: %s", _tmp7_); +#line 2657 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 2638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2657 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 2638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2657 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20188 "Photo.c" +#line 20313 "Photo.c" } - __finally363: -#line 2633 "/home/jens/Source/shotwell/src/Photo.vala" + __finally375: +#line 2652 "/home/jens/Source/shotwell/src/Photo.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 2633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2652 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2652 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20197 "Photo.c" +#line 20322 "Photo.c" } @@ -20208,39 +20333,39 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) { PhotoMetadata* _tmp4_; PhotoMetadata* _tmp5_; GError * _inner_error_ = NULL; -#line 2642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2661 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_master_reader (self); -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_reader_read_metadata (_tmp2_, &_inner_error_); -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp2_); -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp4_; -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20230 "Photo.c" +#line 20355 "Photo.c" } -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp0_; -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (_tmp0_); -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20242 "Photo.c" +#line 20367 "Photo.c" } @@ -20251,53 +20376,53 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) { PhotoMetadata* _tmp1_ = NULL; PhotoFileReader* _tmp2_; GError * _inner_error_ = NULL; -#line 2646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2665 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_editable_reader (self); -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" reader = _tmp0_; -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 20263 "Photo.c" +#line 20388 "Photo.c" PhotoFileReader* _tmp3_; PhotoMetadata* _tmp4_; -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = reader; -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_file_reader_read_metadata (_tmp3_, &_inner_error_); -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (_tmp1_); -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp4_; -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (_tmp1_); -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20284 "Photo.c" +#line 20409 "Photo.c" } } else { -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (_tmp1_); -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 20291 "Photo.c" +#line 20416 "Photo.c" } -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2668 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20299 "Photo.c" +#line 20424 "Photo.c" } @@ -20318,178 +20443,178 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph gboolean _tmp12_; PhotoReimportMasterState* _tmp14_; GError * _inner_error_ = NULL; -#line 2655 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2674 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2655 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2674 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_METADATA (metadata), FALSE); -#line 2657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2676 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 2657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2676 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = NULL; -#line 2659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2678 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_master_reader (self); -#line 2659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2678 "/home/jens/Source/shotwell/src/Photo.vala" master_reader = _tmp0_; -#line 2661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = master_reader; -#line 2661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2680 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2681 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2681 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2681 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2681 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20348 "Photo.c" +#line 20473 "Photo.c" } else { -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2681 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20352 "Photo.c" +#line 20477 "Photo.c" } -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2681 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20356 "Photo.c" +#line 20481 "Photo.c" } -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = master_reader; -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_file_reader_create_metadata_writer (_tmp5_, &_inner_error_); -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp6_; -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20366 "Photo.c" +#line 20491 "Photo.c" gboolean _tmp7_ = FALSE; -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp7_; -#line 20374 "Photo.c" +#line 20499 "Photo.c" } -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = metadata; -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp4_, _tmp8_, &_inner_error_); -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20382 "Photo.c" +#line 20507 "Photo.c" gboolean _tmp9_ = FALSE; -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp4_); -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp9_; -#line 20392 "Photo.c" +#line 20517 "Photo.c" } -#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_prepare_for_reimport_master (self, &_tmp11_, &_inner_error_); -#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = _tmp11_; -#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp12_; -#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20404 "Photo.c" +#line 20529 "Photo.c" gboolean _tmp13_ = FALSE; -#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp4_); -#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); -#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp13_; -#line 20414 "Photo.c" +#line 20539 "Photo.c" } -#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp10_) { -#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp4_); -#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); -#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20428 "Photo.c" +#line 20553 "Photo.c" } else { -#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20432 "Photo.c" +#line 20557 "Photo.c" } -#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20436 "Photo.c" +#line 20561 "Photo.c" } -#line 2669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2688 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _vala_state; -#line 2669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2688 "/home/jens/Source/shotwell/src/Photo.vala" G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE; -#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp4_); -#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); -#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20452 "Photo.c" +#line 20577 "Photo.c" } else { -#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20456 "Photo.c" +#line 20581 "Photo.c" } -#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20460 "Photo.c" +#line 20585 "Photo.c" } void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error) { PhotoReimportMasterState* _tmp0_; GError * _inner_error_ = NULL; -#line 2674 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2693 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2674 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2693 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state)); -#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = state; -#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" photo_finish_reimport_master (self, _tmp0_, &_inner_error_); -#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20483 "Photo.c" +#line 20608 "Photo.c" } else { -#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2694 "/home/jens/Source/shotwell/src/Photo.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 2675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20491 "Photo.c" +#line 20616 "Photo.c" } } } @@ -20513,200 +20638,200 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, gboolean _tmp13_; PhotoReimportEditableState* _tmp15_; GError * _inner_error_ = NULL; -#line 2678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2697 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2697 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_METADATA (metadata), FALSE); -#line 2680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2699 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 2680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2699 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = NULL; -#line 2682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2701 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_editable_reader (self); -#line 2682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2701 "/home/jens/Source/shotwell/src/Photo.vala" editable_reader = _tmp0_; -#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2702 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = editable_reader; -#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2702 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2703 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2703 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2703 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2703 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20539 "Photo.c" +#line 20664 "Photo.c" } else { -#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2703 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20543 "Photo.c" +#line 20668 "Photo.c" } -#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2703 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20547 "Photo.c" +#line 20672 "Photo.c" } -#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = editable_reader; -#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_file_format_can_write_metadata (_tmp3_); -#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp4_) { -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20565 "Photo.c" +#line 20690 "Photo.c" } else { -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20569 "Photo.c" +#line 20694 "Photo.c" } -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20573 "Photo.c" +#line 20698 "Photo.c" } -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = editable_reader; -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_file_reader_create_metadata_writer (_tmp6_, &_inner_error_); -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp7_; -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20583 "Photo.c" +#line 20708 "Photo.c" gboolean _tmp8_ = FALSE; -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp8_; -#line 20591 "Photo.c" +#line 20716 "Photo.c" } -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = metadata; -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp5_, _tmp9_, &_inner_error_); -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20599 "Photo.c" +#line 20724 "Photo.c" gboolean _tmp10_ = FALSE; -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp5_); -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp10_; -#line 20609 "Photo.c" +#line 20734 "Photo.c" } -#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_prepare_for_reimport_editable (self, &_tmp12_, &_inner_error_); -#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = _tmp12_; -#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp13_; -#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20621 "Photo.c" +#line 20746 "Photo.c" gboolean _tmp14_ = FALSE; -#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp5_); -#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp14_; -#line 20631 "Photo.c" +#line 20756 "Photo.c" } -#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp11_) { -#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp5_); -#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20645 "Photo.c" +#line 20770 "Photo.c" } else { -#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20649 "Photo.c" +#line 20774 "Photo.c" } -#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20653 "Photo.c" +#line 20778 "Photo.c" } -#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _vala_state; -#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE; -#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2715 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2715 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp5_); -#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2715 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2715 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2715 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20669 "Photo.c" +#line 20794 "Photo.c" } else { -#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2715 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20673 "Photo.c" +#line 20798 "Photo.c" } -#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2715 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20677 "Photo.c" +#line 20802 "Photo.c" } void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error) { PhotoReimportEditableState* _tmp0_; GError * _inner_error_ = NULL; -#line 2699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2718 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2718 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_EDITABLE_STATE (state)); -#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = state; -#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" photo_finish_reimport_editable (self, _tmp0_, &_inner_error_); -#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20700 "Photo.c" +#line 20825 "Photo.c" } else { -#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2719 "/home/jens/Source/shotwell/src/Photo.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 2700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20708 "Photo.c" +#line 20833 "Photo.c" } } } @@ -20714,54 +20839,54 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt void photo_get_raw_dimensions (Photo* self, Dimensions* result) { GError * _inner_error_ = NULL; -#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 20718 "Photo.c" +#line 20843 "Photo.c" { PhotoRow* _tmp0_; -#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20725 "Photo.c" +#line 20850 "Photo.c" { BackingPhotoRow* _tmp1_; Dimensions _tmp2_; -#line 2707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->backing_photo_row; -#line 2707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->dim; -#line 2707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 20735 "Photo.c" +#line 20860 "Photo.c" { PhotoRow* _tmp3_; -#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20742 "Photo.c" +#line 20867 "Photo.c" } -#line 2707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20746 "Photo.c" +#line 20871 "Photo.c" } - __finally364: + __finally376: { PhotoRow* _tmp4_; -#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20755 "Photo.c" +#line 20880 "Photo.c" } -#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2725 "/home/jens/Source/shotwell/src/Photo.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 2706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20763 "Photo.c" +#line 20888 "Photo.c" } } @@ -20769,78 +20894,78 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) { gboolean photo_has_transformations (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2730 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 20773 "Photo.c" +#line 20898 "Photo.c" { PhotoRow* _tmp0_; gboolean _tmp10_ = FALSE; -#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2731 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20781 "Photo.c" +#line 20906 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoRow* _tmp2_; Orientation _tmp3_; BackingPhotoRow* _tmp4_; Orientation _tmp5_; -#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->orientation; -#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->backing_photo_row; -#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->original_orientation; -#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2732 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != _tmp5_) { -#line 2714 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2733 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = TRUE; -#line 20800 "Photo.c" +#line 20925 "Photo.c" } else { PhotoRow* _tmp6_; GeeHashMap* _tmp7_; -#line 2715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2734 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2734 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->transformations; -#line 2715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2734 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp7_ != NULL; -#line 20810 "Photo.c" +#line 20935 "Photo.c" } -#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2732 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 20814 "Photo.c" +#line 20939 "Photo.c" { PhotoRow* _tmp8_; -#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; -#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2731 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20821 "Photo.c" +#line 20946 "Photo.c" } -#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2732 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20825 "Photo.c" +#line 20950 "Photo.c" } - __finally365: + __finally377: { PhotoRow* _tmp9_; -#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2731 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20834 "Photo.c" +#line 20959 "Photo.c" } -#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2731 "/home/jens/Source/shotwell/src/Photo.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 2712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2731 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2731 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp10_; -#line 20842 "Photo.c" +#line 20967 "Photo.c" } } @@ -20852,153 +20977,153 @@ gboolean photo_only_metadata_changed (Photo* self) { PhotoMetadata* _tmp0_; PhotoMetadata* _tmp1_; GError * _inner_error_ = NULL; -#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2738 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2720 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2739 "/home/jens/Source/shotwell/src/Photo.vala" date_time = NULL; -#line 2722 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2741 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource)); -#line 2722 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2741 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp0_; -#line 2723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2742 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = metadata; -#line 2723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2742 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 20866 "Photo.c" +#line 20991 "Photo.c" PhotoMetadata* _tmp2_; MetadataDateTime* _tmp3_; -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2743 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2743 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_metadata_get_exposure_date_time (_tmp2_); -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2743 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2743 "/home/jens/Source/shotwell/src/Photo.vala" date_time = _tmp3_; -#line 20877 "Photo.c" +#line 21002 "Photo.c" } { PhotoRow* _tmp4_; gboolean _tmp21_ = FALSE; -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2745 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20886 "Photo.c" +#line 21011 "Photo.c" { gboolean _tmp5_ = FALSE; PhotoRow* _tmp6_; GeeHashMap* _tmp7_; -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->transformations; -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_ == NULL) { -#line 20897 "Photo.c" +#line 21022 "Photo.c" gboolean _tmp8_ = FALSE; PhotoRow* _tmp9_; Orientation _tmp10_; BackingPhotoRow* _tmp11_; Orientation _tmp12_; -#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->orientation; -#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->backing_photo_row; -#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->original_orientation; -#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2747 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_ != _tmp12_) { -#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = TRUE; -#line 20915 "Photo.c" +#line 21040 "Photo.c" } else { gboolean _tmp13_ = FALSE; MetadataDateTime* _tmp14_; -#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = date_time; -#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 20923 "Photo.c" +#line 21048 "Photo.c" PhotoRow* _tmp15_; time_t _tmp16_; MetadataDateTime* _tmp17_; time_t _tmp18_; -#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_->exposure_time; -#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = date_time; -#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = metadata_date_time_get_timestamp (_tmp17_); -#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp16_ != _tmp18_; -#line 20938 "Photo.c" +#line 21063 "Photo.c" } else { -#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = FALSE; -#line 20942 "Photo.c" +#line 21067 "Photo.c" } -#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp13_; -#line 20946 "Photo.c" +#line 21071 "Photo.c" } -#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp8_; -#line 20950 "Photo.c" +#line 21075 "Photo.c" } else { -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = FALSE; -#line 20954 "Photo.c" +#line 21079 "Photo.c" } -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 20958 "Photo.c" +#line 21083 "Photo.c" { PhotoRow* _tmp19_; -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2745 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20965 "Photo.c" +#line 21090 "Photo.c" } -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20973 "Photo.c" +#line 21098 "Photo.c" } - __finally366: + __finally378: { PhotoRow* _tmp20_; -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->row; -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2745 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20982 "Photo.c" +#line 21107 "Photo.c" } -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2745 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2745 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2745 "/home/jens/Source/shotwell/src/Photo.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 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2745 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2745 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp21_; -#line 20994 "Photo.c" +#line 21119 "Photo.c" } -#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2738 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2738 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 21000 "Photo.c" +#line 21125 "Photo.c" } @@ -21012,145 +21137,145 @@ gboolean photo_has_alterations (Photo* self) { PhotoMetadata* _tmp1_; MetadataDateTime* _tmp8_; GError * _inner_error_ = NULL; -#line 2733 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2753 "/home/jens/Source/shotwell/src/Photo.vala" date_time = NULL; -#line 2735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2754 "/home/jens/Source/shotwell/src/Photo.vala" title = NULL; -#line 2736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2755 "/home/jens/Source/shotwell/src/Photo.vala" comment = NULL; -#line 2738 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource)); -#line 2738 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp0_; -#line 2739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = metadata; -#line 2739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 21030 "Photo.c" +#line 21155 "Photo.c" PhotoMetadata* _tmp2_; MetadataDateTime* _tmp3_; PhotoMetadata* _tmp4_; gchar* _tmp5_; PhotoMetadata* _tmp6_; gchar* _tmp7_; -#line 2740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 2740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_metadata_get_exposure_date_time (_tmp2_); -#line 2740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" date_time = _tmp3_; -#line 2741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = metadata; -#line 2741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 2741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 2741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" title = _tmp5_; -#line 2742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = metadata; -#line 2742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 2742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 2742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" comment = _tmp7_; -#line 21061 "Photo.c" +#line 21186 "Photo.c" } -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2765 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = date_time; -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2765 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ == NULL) { -#line 21067 "Photo.c" +#line 21192 "Photo.c" { PhotoRow* _tmp9_; -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21074 "Photo.c" +#line 21199 "Photo.c" { BackingPhotoRow* _tmp10_; time_t _tmp11_; PhotoRow* _tmp12_; time_t _tmp13_; -#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->backing_photo_row; -#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_->timestamp; -#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->row; -#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_->exposure_time; -#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_ != _tmp13_) { -#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 21092 "Photo.c" +#line 21217 "Photo.c" { PhotoRow* _tmp14_; -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21099 "Photo.c" +#line 21224 "Photo.c" } -#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21111 "Photo.c" +#line 21236 "Photo.c" } } - __finally367: + __finally379: { PhotoRow* _tmp15_; -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21121 "Photo.c" +#line 21246 "Photo.c" } -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 21125 "Photo.c" +#line 21250 "Photo.c" gboolean _tmp16_ = FALSE; -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.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 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp16_; -#line 21141 "Photo.c" +#line 21266 "Photo.c" } } } { PhotoRow* _tmp17_; gboolean _tmp42_ = FALSE; -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->row; -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21152 "Photo.c" +#line 21277 "Photo.c" { gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; @@ -21158,184 +21283,184 @@ gboolean photo_has_alterations (Photo* self) { gboolean _tmp21_ = FALSE; PhotoRow* _tmp22_; GeeHashMap* _tmp23_; -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = self->row; -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_->transformations; -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_ != NULL) { -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = TRUE; -#line 21168 "Photo.c" +#line 21293 "Photo.c" } else { PhotoRow* _tmp24_; Orientation _tmp25_; BackingPhotoRow* _tmp26_; Orientation _tmp27_; -#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2778 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = self->row; -#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2778 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_->orientation; -#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2778 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = self->backing_photo_row; -#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2778 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_->original_orientation; -#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2778 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp25_ != _tmp27_; -#line 21184 "Photo.c" +#line 21309 "Photo.c" } -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = TRUE; -#line 21190 "Photo.c" +#line 21315 "Photo.c" } else { gboolean _tmp28_ = FALSE; MetadataDateTime* _tmp29_; -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = date_time; -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_ != NULL) { -#line 21198 "Photo.c" +#line 21323 "Photo.c" PhotoRow* _tmp30_; time_t _tmp31_; MetadataDateTime* _tmp32_; time_t _tmp33_; -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = self->row; -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_->exposure_time; -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = date_time; -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = metadata_date_time_get_timestamp (_tmp32_); -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp31_ != _tmp33_; -#line 21213 "Photo.c" +#line 21338 "Photo.c" } else { -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = FALSE; -#line 21217 "Photo.c" +#line 21342 "Photo.c" } -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp28_; -#line 21221 "Photo.c" +#line 21346 "Photo.c" } -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp20_) { -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = TRUE; -#line 21227 "Photo.c" +#line 21352 "Photo.c" } else { gchar* _tmp34_; gchar* _tmp35_; const gchar* _tmp36_; -#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2780 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2780 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_; -#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2780 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = comment; -#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2780 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = g_strcmp0 (_tmp35_, _tmp36_) != 0; -#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2780 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp35_); -#line 21242 "Photo.c" +#line 21367 "Photo.c" } -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_) { -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = TRUE; -#line 21248 "Photo.c" +#line 21373 "Photo.c" } else { gchar* _tmp37_; gchar* _tmp38_; const gchar* _tmp39_; -#line 2762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 2762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp37_; -#line 2762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = title; -#line 2762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = g_strcmp0 (_tmp38_, _tmp39_) != 0; -#line 2762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp38_); -#line 21263 "Photo.c" +#line 21388 "Photo.c" } -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp18_; -#line 21267 "Photo.c" +#line 21392 "Photo.c" { PhotoRow* _tmp40_; -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = self->row; -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21274 "Photo.c" +#line 21399 "Photo.c" } -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21286 "Photo.c" +#line 21411 "Photo.c" } - __finally368: + __finally380: { PhotoRow* _tmp41_; -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = self->row; -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21295 "Photo.c" +#line 21420 "Photo.c" } -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.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 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp42_; -#line 21311 "Photo.c" +#line 21436 "Photo.c" } -#line 2733 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2733 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 2733 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 2733 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 21321 "Photo.c" +#line 21446 "Photo.c" } PhotoTransformationState* photo_save_transformation_state (Photo* self) { PhotoTransformationState* result = NULL; GError * _inner_error_ = NULL; -#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2786 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 21330 "Photo.c" +#line 21455 "Photo.c" { PhotoRow* _tmp0_; -#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21337 "Photo.c" +#line 21462 "Photo.c" { PixelTransformer* _tmp1_ = NULL; PixelTransformer* _tmp2_; @@ -21346,112 +21471,112 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { PhotoRow* _tmp11_; GeeHashMap* _tmp12_; PhotoPhotoTransformationStateImpl* _tmp13_; -#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->transformer; -#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 21352 "Photo.c" +#line 21477 "Photo.c" PixelTransformer* _tmp3_; PixelTransformer* _tmp4_; -#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->transformer; -#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = pixel_transformer_copy (_tmp3_); -#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp1_); -#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp4_; -#line 21363 "Photo.c" +#line 21488 "Photo.c" } else { -#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp1_); -#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 21369 "Photo.c" +#line 21494 "Photo.c" } -#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->adjustments; -#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != NULL) { -#line 21375 "Photo.c" +#line 21500 "Photo.c" PixelTransformationBundle* _tmp7_; PixelTransformationBundle* _tmp8_; -#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->adjustments; -#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = pixel_transformation_bundle_copy (_tmp7_); -#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp5_); -#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp8_; -#line 21386 "Photo.c" +#line 21511 "Photo.c" } else { -#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp5_); -#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = NULL; -#line 21392 "Photo.c" +#line 21517 "Photo.c" } -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->orientation; -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->transformations; -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_photo_transformation_state_impl_new (self, _tmp10_, _tmp12_, _tmp1_, _tmp5_); -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState); -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp5_); -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp1_); -#line 21410 "Photo.c" +#line 21535 "Photo.c" { PhotoRow* _tmp14_; -#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21417 "Photo.c" +#line 21542 "Photo.c" } -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21421 "Photo.c" +#line 21546 "Photo.c" } - __finally369: + __finally381: { PhotoRow* _tmp15_; -#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21430 "Photo.c" +#line 21555 "Photo.c" } -#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.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 2768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 21438 "Photo.c" +#line 21563 "Photo.c" } } static gpointer _pixel_transformer_ref0 (gpointer self) { -#line 2793 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2812 "/home/jens/Source/shotwell/src/Photo.vala" return self ? pixel_transformer_ref (self) : NULL; -#line 21446 "Photo.c" +#line 21571 "Photo.c" } static gpointer _pixel_transformation_bundle_ref0 (gpointer self) { -#line 2794 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2813 "/home/jens/Source/shotwell/src/Photo.vala" return self ? pixel_transformation_bundle_ref (self) : NULL; -#line 21453 "Photo.c" +#line 21578 "Photo.c" } @@ -21476,60 +21601,60 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* gboolean committed = FALSE; gboolean _tmp31_; GError * _inner_error_ = NULL; -#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_TRANSFORMATION_STATE (state), FALSE); -#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2796 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = state; -#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2796 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL) ? ((PhotoPhotoTransformationStateImpl*) _tmp0_) : NULL); -#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2796 "/home/jens/Source/shotwell/src/Photo.vala" state_impl = _tmp1_; -#line 2778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2797 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = state_impl; -#line 2778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2797 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2798 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2798 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (state_impl); -#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2798 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21498 "Photo.c" +#line 21623 "Photo.c" } -#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = state_impl; -#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_photo_transformation_state_impl_get_orientation (_tmp3_); -#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2800 "/home/jens/Source/shotwell/src/Photo.vala" saved_orientation = _tmp4_; -#line 2782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = state_impl; -#line 2782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_photo_transformation_state_impl_get_transformations (_tmp5_); -#line 2782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" saved_transformations = _tmp6_; -#line 2783 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = state_impl; -#line 2783 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_photo_transformation_state_impl_get_transformer (_tmp7_); -#line 2783 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2802 "/home/jens/Source/shotwell/src/Photo.vala" saved_transformer = _tmp8_; -#line 2784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2803 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = state_impl; -#line 2784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2803 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_photo_transformation_state_impl_get_color_adjustments (_tmp9_); -#line 2784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2803 "/home/jens/Source/shotwell/src/Photo.vala" saved_adjustments = _tmp10_; -#line 21524 "Photo.c" +#line 21649 "Photo.c" { PhotoRow* _tmp11_; -#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2806 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2806 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21531 "Photo.c" +#line 21656 "Photo.c" { PhotoTable* _tmp12_; PhotoTable* _tmp13_; @@ -21539,29 +21664,29 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* GeeHashMap* _tmp17_; gboolean _tmp18_; gboolean _tmp19_; -#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_table_get_instance (); -#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->photo_id; -#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = saved_orientation; -#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = saved_transformations; -#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = photo_table_set_transformation_state (_tmp13_, &_tmp15_, _tmp16_, _tmp17_); -#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2807 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp18_; -#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2807 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp13_); -#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2809 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = committed; -#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2809 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_) { -#line 21563 "Photo.c" +#line 21688 "Photo.c" PhotoRow* _tmp20_; Orientation _tmp21_; PhotoRow* _tmp22_; @@ -21571,110 +21696,110 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* PixelTransformer* _tmp26_; PixelTransformationBundle* _tmp27_; PixelTransformationBundle* _tmp28_; -#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->row; -#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = saved_orientation; -#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_->orientation = _tmp21_; -#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = self->row; -#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = saved_transformations; -#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _g_object_ref0 (_tmp23_); -#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp22_->transformations); -#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_->transformations = _tmp24_; -#line 2793 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2812 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = saved_transformer; -#line 2793 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2812 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _pixel_transformer_ref0 (_tmp25_); -#line 2793 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2812 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); -#line 2793 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2812 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = _tmp26_; -#line 2794 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2813 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = saved_adjustments; -#line 2794 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2813 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _pixel_transformation_bundle_ref0 (_tmp27_); -#line 2794 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2813 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); -#line 2794 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2813 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = _tmp28_; -#line 21605 "Photo.c" +#line 21730 "Photo.c" } } - __finally370: + __finally382: { PhotoRow* _tmp29_; -#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2806 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = self->row; -#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2806 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21615 "Photo.c" +#line 21740 "Photo.c" } -#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2806 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 21619 "Photo.c" +#line 21744 "Photo.c" gboolean _tmp30_ = FALSE; -#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2806 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (saved_adjustments); -#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2806 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (saved_transformer); -#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2806 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (saved_transformations); -#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2806 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (state_impl); -#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2806 "/home/jens/Source/shotwell/src/Photo.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 2787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2806 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2806 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp30_; -#line 21635 "Photo.c" +#line 21760 "Photo.c" } } -#line 2798 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2817 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = committed; -#line 2798 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2817 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp31_) { -#line 21642 "Photo.c" +#line 21767 "Photo.c" Alteration* _tmp32_; Alteration* _tmp33_; -#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = alteration_new ("image", "transformation-state"); -#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_; -#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp33_); -#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp33_); -#line 21653 "Photo.c" +#line 21778 "Photo.c" } -#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; -#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (saved_adjustments); -#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (saved_transformer); -#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (saved_transformations); -#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (state_impl); -#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21667 "Photo.c" +#line 21792 "Photo.c" } void photo_remove_all_transformations (Photo* self) { -#line 2804 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2823 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2824 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, TRUE); -#line 21676 "Photo.c" +#line 21801 "Photo.c" } @@ -21683,18 +21808,18 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not gboolean _tmp21_ = FALSE; gboolean _tmp22_; GError * _inner_error_ = NULL; -#line 2808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2827 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2828 "/home/jens/Source/shotwell/src/Photo.vala" is_altered = FALSE; -#line 21689 "Photo.c" +#line 21814 "Photo.c" { PhotoRow* _tmp0_; -#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2829 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21696 "Photo.c" +#line 21821 "Photo.c" { PhotoTable* _tmp1_; PhotoTable* _tmp2_; @@ -21706,45 +21831,45 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not Orientation _tmp8_; BackingPhotoRow* _tmp9_; Orientation _tmp10_; -#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->photo_id; -#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_table_remove_all_transformations (_tmp2_, &_tmp4_); -#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" is_altered = _tmp5_; -#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 2812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2831 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2831 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp6_->transformations); -#line 2812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2831 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_->transformations = NULL; -#line 2814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2833 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); -#line 2814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2833 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = NULL; -#line 2815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2834 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); -#line 2815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2834 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = NULL; -#line 2817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 2817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->orientation; -#line 2817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->backing_photo_row; -#line 2817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->original_orientation; -#line 2817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != _tmp10_) { -#line 21746 "Photo.c" +#line 21871 "Photo.c" PhotoTable* _tmp11_; PhotoTable* _tmp12_; PhotoRow* _tmp13_; @@ -21754,85 +21879,85 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not PhotoRow* _tmp17_; BackingPhotoRow* _tmp18_; Orientation _tmp19_; -#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_table_get_instance (); -#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_; -#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->row; -#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->photo_id; -#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->backing_photo_row; -#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_->original_orientation; -#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_set_orientation (_tmp12_, &_tmp14_, _tmp16_); -#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp12_); -#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2839 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->row; -#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2839 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->backing_photo_row; -#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2839 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->original_orientation; -#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2839 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_->orientation = _tmp19_; -#line 2821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2840 "/home/jens/Source/shotwell/src/Photo.vala" is_altered = TRUE; -#line 21782 "Photo.c" +#line 21907 "Photo.c" } } - __finally371: + __finally383: { PhotoRow* _tmp20_; -#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->row; -#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2829 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21792 "Photo.c" +#line 21917 "Photo.c" } -#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2829 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2829 "/home/jens/Source/shotwell/src/Photo.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 2810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2829 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2829 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 21802 "Photo.c" +#line 21927 "Photo.c" } } -#line 2825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = is_altered; -#line 2825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_) { -#line 21809 "Photo.c" +#line 21934 "Photo.c" gboolean _tmp23_; -#line 2825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = notify; -#line 2825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp23_; -#line 21815 "Photo.c" +#line 21940 "Photo.c" } else { -#line 2825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = FALSE; -#line 21819 "Photo.c" +#line 21944 "Photo.c" } -#line 2825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 21823 "Photo.c" +#line 21948 "Photo.c" Alteration* _tmp24_; Alteration* _tmp25_; -#line 2826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = alteration_new ("image", "revert"); -#line 2826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_; -#line 2826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); -#line 2826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp25_); -#line 21834 "Photo.c" +#line 21959 "Photo.c" } } @@ -21840,54 +21965,54 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not Orientation photo_get_original_orientation (Photo* self) { Orientation result = 0; GError * _inner_error_ = NULL; -#line 2829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2848 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 21844 "Photo.c" +#line 21969 "Photo.c" { PhotoRow* _tmp0_; -#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2849 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21851 "Photo.c" +#line 21976 "Photo.c" { BackingPhotoRow* _tmp1_; Orientation _tmp2_; -#line 2831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2850 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->backing_photo_row; -#line 2831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2850 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->original_orientation; -#line 2831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2850 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 21861 "Photo.c" +#line 21986 "Photo.c" { PhotoRow* _tmp3_; -#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2849 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21868 "Photo.c" +#line 21993 "Photo.c" } -#line 2831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2850 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21872 "Photo.c" +#line 21997 "Photo.c" } - __finally372: + __finally384: { PhotoRow* _tmp4_; -#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2849 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21881 "Photo.c" +#line 22006 "Photo.c" } -#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2849 "/home/jens/Source/shotwell/src/Photo.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 2830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2849 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2849 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 21889 "Photo.c" +#line 22014 "Photo.c" } } @@ -21895,54 +22020,54 @@ Orientation photo_get_original_orientation (Photo* self) { Orientation photo_get_orientation (Photo* self) { Orientation result = 0; GError * _inner_error_ = NULL; -#line 2835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2854 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 21899 "Photo.c" +#line 22024 "Photo.c" { PhotoRow* _tmp0_; -#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2855 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21906 "Photo.c" +#line 22031 "Photo.c" { PhotoRow* _tmp1_; Orientation _tmp2_; -#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->orientation; -#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2856 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 21916 "Photo.c" +#line 22041 "Photo.c" { PhotoRow* _tmp3_; -#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2855 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21923 "Photo.c" +#line 22048 "Photo.c" } -#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2856 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21927 "Photo.c" +#line 22052 "Photo.c" } - __finally373: + __finally385: { PhotoRow* _tmp4_; -#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2855 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21936 "Photo.c" +#line 22061 "Photo.c" } -#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2855 "/home/jens/Source/shotwell/src/Photo.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 2836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2855 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2855 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 21944 "Photo.c" +#line 22069 "Photo.c" } } @@ -21952,31 +22077,31 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) { gboolean committed = FALSE; gboolean _tmp15_; GError * _inner_error_ = NULL; -#line 2841 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2860 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2861 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 21958 "Photo.c" +#line 22083 "Photo.c" { PhotoRow* _tmp0_; -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21965 "Photo.c" +#line 22090 "Photo.c" { PhotoRow* _tmp1_; Orientation _tmp2_; Orientation _tmp3_; -#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->orientation; -#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = orientation; -#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != _tmp3_) { -#line 21978 "Photo.c" +#line 22103 "Photo.c" PhotoTable* _tmp4_; PhotoTable* _tmp5_; PhotoRow* _tmp6_; @@ -21984,98 +22109,98 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) { Orientation _tmp8_; gboolean _tmp9_; gboolean _tmp10_; -#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_table_get_instance (); -#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->photo_id; -#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = orientation; -#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_table_set_orientation (_tmp5_, &_tmp7_, _tmp8_); -#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2864 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp9_; -#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2864 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp5_); -#line 2846 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2865 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = committed; -#line 2846 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2865 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_) { -#line 22006 "Photo.c" +#line 22131 "Photo.c" PhotoRow* _tmp11_; Orientation _tmp12_; -#line 2847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2866 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2866 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = orientation; -#line 2847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2866 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_->orientation = _tmp12_; -#line 22015 "Photo.c" +#line 22140 "Photo.c" } } } - __finally374: + __finally386: { PhotoRow* _tmp13_; -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->row; -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22026 "Photo.c" +#line 22151 "Photo.c" } -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 22030 "Photo.c" +#line 22155 "Photo.c" gboolean _tmp14_ = FALSE; -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2862 "/home/jens/Source/shotwell/src/Photo.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 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp14_; -#line 22038 "Photo.c" +#line 22163 "Photo.c" } } -#line 2851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2870 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = committed; -#line 2851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2870 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 22045 "Photo.c" +#line 22170 "Photo.c" Alteration* _tmp16_; Alteration* _tmp17_; -#line 2852 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = alteration_new ("image", "orientation"); -#line 2852 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 2852 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2871 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp17_); -#line 2852 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2871 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp17_); -#line 22056 "Photo.c" +#line 22181 "Photo.c" } -#line 2854 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2873 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; -#line 2854 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2873 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22062 "Photo.c" +#line 22187 "Photo.c" } gboolean photo_check_can_rotate (Photo* self) { gboolean result = FALSE; gboolean _tmp0_; -#line 2857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2876 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2877 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->can_rotate_now; -#line 2858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2877 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 2858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2877 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22077 "Photo.c" +#line 22202 "Photo.c" } @@ -22083,135 +22208,135 @@ static void photo_real_rotate (Photo* self, Rotation rotation) { GError * _inner_error_ = NULL; { PhotoRow* _tmp0_; -#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2881 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22089 "Photo.c" +#line 22214 "Photo.c" { Orientation _tmp1_; Rotation _tmp2_; Orientation _tmp3_; -#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_orientation (self); -#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = rotation; -#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = orientation_perform (_tmp1_, _tmp2_); -#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp3_); -#line 22102 "Photo.c" +#line 22227 "Photo.c" } - __finally375: + __finally387: { PhotoRow* _tmp4_; -#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2881 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22111 "Photo.c" +#line 22236 "Photo.c" } -#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2881 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2881 "/home/jens/Source/shotwell/src/Photo.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 2862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2881 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2881 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 22121 "Photo.c" +#line 22246 "Photo.c" } } } void photo_rotate (Photo* self, Rotation rotation) { -#line 2861 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2861 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->rotate (self, rotation); -#line 22132 "Photo.c" +#line 22257 "Photo.c" } static gboolean photo_has_transformation (Photo* self, const gchar* name) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2886 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2886 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (name != NULL, FALSE); -#line 22143 "Photo.c" +#line 22268 "Photo.c" { PhotoRow* _tmp0_; gboolean _tmp10_ = FALSE; -#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22151 "Photo.c" +#line 22276 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoRow* _tmp2_; GeeHashMap* _tmp3_; -#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->transformations; -#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 22162 "Photo.c" +#line 22287 "Photo.c" PhotoRow* _tmp4_; GeeHashMap* _tmp5_; const gchar* _tmp6_; gboolean _tmp7_; -#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->transformations; -#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = name; -#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_); -#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp7_; -#line 22177 "Photo.c" +#line 22302 "Photo.c" } else { -#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 22181 "Photo.c" +#line 22306 "Photo.c" } -#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 22185 "Photo.c" +#line 22310 "Photo.c" { PhotoRow* _tmp8_; -#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; -#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22192 "Photo.c" +#line 22317 "Photo.c" } -#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22196 "Photo.c" +#line 22321 "Photo.c" } - __finally376: + __finally388: { PhotoRow* _tmp9_; -#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22205 "Photo.c" +#line 22330 "Photo.c" } -#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2887 "/home/jens/Source/shotwell/src/Photo.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 2868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2887 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp10_; -#line 22213 "Photo.c" +#line 22338 "Photo.c" } } @@ -22220,112 +22345,112 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { KeyValueMap* result = NULL; KeyValueMap* map = NULL; GError * _inner_error_ = NULL; -#line 2876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2895 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 2876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2895 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (name != NULL, NULL); -#line 2877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" map = NULL; -#line 22228 "Photo.c" +#line 22353 "Photo.c" { PhotoRow* _tmp0_; -#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2897 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2897 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22235 "Photo.c" +#line 22360 "Photo.c" { PhotoRow* _tmp1_; GeeHashMap* _tmp2_; -#line 2879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2898 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2898 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->transformations; -#line 2879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2898 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 22245 "Photo.c" +#line 22370 "Photo.c" PhotoRow* _tmp3_; GeeHashMap* _tmp4_; const gchar* _tmp5_; gpointer _tmp6_; KeyValueMap* _tmp7_; -#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->transformations; -#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = name; -#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); -#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2899 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2899 "/home/jens/Source/shotwell/src/Photo.vala" map = (KeyValueMap*) _tmp6_; -#line 2881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2900 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = map; -#line 2881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2900 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_ != NULL) { -#line 22267 "Photo.c" +#line 22392 "Photo.c" KeyValueMap* _tmp8_; KeyValueMap* _tmp9_; -#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2901 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = map; -#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2901 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = key_value_map_copy (_tmp8_); -#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2901 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2901 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp9_; -#line 22278 "Photo.c" +#line 22403 "Photo.c" } } } - __finally377: + __finally389: { PhotoRow* _tmp10_; -#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2897 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->row; -#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2897 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22289 "Photo.c" +#line 22414 "Photo.c" } -#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2897 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2897 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2897 "/home/jens/Source/shotwell/src/Photo.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 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2897 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2897 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 22301 "Photo.c" +#line 22426 "Photo.c" } } -#line 2886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2905 "/home/jens/Source/shotwell/src/Photo.vala" result = map; -#line 2886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2905 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22308 "Photo.c" +#line 22433 "Photo.c" } static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 2889 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2908 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2889 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2908 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_KEY_VALUE_MAP (trans), FALSE); -#line 22319 "Photo.c" +#line 22444 "Photo.c" { PhotoRow* _tmp0_; gboolean _tmp20_ = FALSE; -#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22327 "Photo.c" +#line 22452 "Photo.c" { PhotoRow* _tmp1_; GeeHashMap* _tmp2_; @@ -22342,88 +22467,88 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) { KeyValueMap* _tmp15_; gboolean _tmp16_; gboolean _tmp17_; -#line 2891 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2910 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2891 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2910 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->transformations; -#line 2891 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2910 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 22350 "Photo.c" +#line 22475 "Photo.c" PhotoRow* _tmp3_; GeeHashMap* _tmp4_; -#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_->transformations); -#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_->transformations = _tmp4_; -#line 22361 "Photo.c" +#line 22486 "Photo.c" } -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->transformations; -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = trans; -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = key_value_map_get_group (_tmp7_); -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = trans; -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_); -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp9_); -#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_table_get_instance (); -#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_; -#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->row; -#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->photo_id; -#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = trans; -#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo_table_set_transformation (_tmp12_, &_tmp14_, _tmp15_); -#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp12_); -#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp17_; -#line 22397 "Photo.c" +#line 22522 "Photo.c" { PhotoRow* _tmp18_; -#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->row; -#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22404 "Photo.c" +#line 22529 "Photo.c" } -#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22408 "Photo.c" +#line 22533 "Photo.c" } - __finally378: + __finally390: { PhotoRow* _tmp19_; -#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22417 "Photo.c" +#line 22542 "Photo.c" } -#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2909 "/home/jens/Source/shotwell/src/Photo.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 2890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp20_; -#line 22425 "Photo.c" +#line 22550 "Photo.c" } } @@ -22435,18 +22560,18 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) { gboolean _tmp20_ = FALSE; gboolean _tmp21_; GError * _inner_error_ = NULL; -#line 2900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2919 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2919 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (name != NULL, FALSE); -#line 22441 "Photo.c" +#line 22566 "Photo.c" { PhotoRow* _tmp0_; -#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2921 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22448 "Photo.c" +#line 22573 "Photo.c" { PhotoRow* _tmp1_; GeeHashMap* _tmp2_; @@ -22456,13 +22581,13 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) { PhotoID _tmp15_; const gchar* _tmp16_; gboolean _tmp17_; -#line 2903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->transformations; -#line 2903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2922 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 22464 "Photo.c" +#line 22589 "Photo.c" PhotoRow* _tmp3_; GeeHashMap* _tmp4_; const gchar* _tmp5_; @@ -22471,113 +22596,113 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) { GeeHashMap* _tmp8_; gint _tmp9_; gint _tmp10_; -#line 2904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->transformations; -#line 2904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = name; -#line 2904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, NULL); -#line 2904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2923 "/home/jens/Source/shotwell/src/Photo.vala" altered_cache = _tmp6_; -#line 2905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2924 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 2905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2924 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->transformations; -#line 2905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2924 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 2905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2924 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_; -#line 2905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2924 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_ == 0) { -#line 22493 "Photo.c" +#line 22618 "Photo.c" PhotoRow* _tmp11_; -#line 2906 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2925 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2906 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2925 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp11_->transformations); -#line 2906 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2925 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_->transformations = NULL; -#line 22501 "Photo.c" +#line 22626 "Photo.c" } } else { -#line 2908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2927 "/home/jens/Source/shotwell/src/Photo.vala" altered_cache = FALSE; -#line 22506 "Photo.c" +#line 22631 "Photo.c" } -#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_table_get_instance (); -#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->photo_id; -#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = name; -#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_table_remove_transformation (_tmp13_, &_tmp15_, _tmp16_); -#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" altered_persistent = _tmp17_; -#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp13_); -#line 22524 "Photo.c" +#line 22649 "Photo.c" } - __finally379: + __finally391: { PhotoRow* _tmp18_; -#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->row; -#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2921 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22533 "Photo.c" +#line 22658 "Photo.c" } -#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2921 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 22537 "Photo.c" +#line 22662 "Photo.c" gboolean _tmp19_ = FALSE; -#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2921 "/home/jens/Source/shotwell/src/Photo.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 2902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2921 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2921 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp19_; -#line 22545 "Photo.c" +#line 22670 "Photo.c" } } -#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2934 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = altered_cache; -#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2934 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2934 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = TRUE; -#line 22554 "Photo.c" +#line 22679 "Photo.c" } else { -#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2934 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = altered_persistent; -#line 22558 "Photo.c" +#line 22683 "Photo.c" } -#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2934 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp20_; -#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2934 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22564 "Photo.c" +#line 22689 "Photo.c" } gboolean photo_has_crop (Photo* self) { gboolean result = FALSE; gboolean _tmp0_; -#line 2918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2937 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_has_transformation (self, "crop"); -#line 2919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 2919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22579 "Photo.c" +#line 22704 "Photo.c" } @@ -22607,136 +22732,136 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { gint _tmp18_; gint _tmp19_; gint _tmp20_; -#line 2923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2942 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2943 "/home/jens/Source/shotwell/src/Photo.vala" box_init (&_vala_crop, 0, 0, 0, 0); -#line 2926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2945 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_transformation (self, "crop"); -#line 2926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2945 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 2927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; -#line 2927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 2928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" if (crop) { -#line 2928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22629 "Photo.c" +#line 22754 "Photo.c" } -#line 2928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22633 "Photo.c" +#line 22758 "Photo.c" } -#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map; -#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = key_value_map_get_int (_tmp2_, "left", -1); -#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" left = _tmp3_; -#line 2931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2950 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; -#line 2931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2950 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = key_value_map_get_int (_tmp4_, "top", -1); -#line 2931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2950 "/home/jens/Source/shotwell/src/Photo.vala" top = _tmp5_; -#line 2932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2951 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = map; -#line 2932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2951 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = key_value_map_get_int (_tmp6_, "right", -1); -#line 2932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2951 "/home/jens/Source/shotwell/src/Photo.vala" right = _tmp7_; -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2952 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = map; -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2952 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = key_value_map_get_int (_tmp8_, "bottom", -1); -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2952 "/home/jens/Source/shotwell/src/Photo.vala" bottom = _tmp9_; -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = left; -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ == -1) { -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = TRUE; -#line 22665 "Photo.c" +#line 22790 "Photo.c" } else { gint _tmp14_; -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = top; -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp14_ == -1; -#line 22672 "Photo.c" +#line 22797 "Photo.c" } -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; -#line 22678 "Photo.c" +#line 22803 "Photo.c" } else { gint _tmp15_; -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = right; -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp15_ == -1; -#line 22685 "Photo.c" +#line 22810 "Photo.c" } -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = TRUE; -#line 22691 "Photo.c" +#line 22816 "Photo.c" } else { gint _tmp16_; -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = bottom; -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp16_ == -1; -#line 22698 "Photo.c" +#line 22823 "Photo.c" } -#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_) { -#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2955 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2955 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2955 "/home/jens/Source/shotwell/src/Photo.vala" if (crop) { -#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2955 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22710 "Photo.c" +#line 22835 "Photo.c" } -#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2955 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22714 "Photo.c" +#line 22839 "Photo.c" } -#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = left; -#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = top; -#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = right; -#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = bottom; -#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2957 "/home/jens/Source/shotwell/src/Photo.vala" box_init (&_vala_crop, _tmp17_, _tmp18_, _tmp19_, _tmp20_); -#line 2940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2959 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 2940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2959 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2959 "/home/jens/Source/shotwell/src/Photo.vala" if (crop) { -#line 2940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2959 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22734 "Photo.c" +#line 22859 "Photo.c" } -#line 2940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2959 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22738 "Photo.c" +#line 22863 "Photo.c" } @@ -22757,68 +22882,68 @@ static void photo_set_raw_crop (Photo* self, Box* crop) { gint _tmp12_; KeyValueMap* _tmp13_; gboolean _tmp14_; -#line 2944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2963 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2963 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (crop != NULL); -#line 2945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2964 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = key_value_map_new ("crop"); -#line 2945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2964 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; -#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = *crop; -#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_.left; -#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp1_, "left", _tmp3_); -#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2966 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; -#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2966 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = *crop; -#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2966 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_.top; -#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2966 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp4_, "top", _tmp6_); -#line 2948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2967 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = map; -#line 2948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2967 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = *crop; -#line 2948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2967 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_.right; -#line 2948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2967 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp7_, "right", _tmp9_); -#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = map; -#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = *crop; -#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_.bottom; -#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2968 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp10_, "bottom", _tmp12_); -#line 2951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = map; -#line 2951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo_set_transformation (self, _tmp13_); -#line 2951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2970 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_) { -#line 22805 "Photo.c" +#line 22930 "Photo.c" Alteration* _tmp15_; Alteration* _tmp16_; -#line 2952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2971 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = alteration_new ("image", "crop"); -#line 2952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2971 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 2952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2971 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_); -#line 2952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2971 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp16_); -#line 22816 "Photo.c" +#line 22941 "Photo.c" } -#line 2944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2963 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 22820 "Photo.c" +#line 22945 "Photo.c" } @@ -22830,51 +22955,51 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) { KeyValueMap* _tmp1_; KeyValueMap* _tmp2_; gdouble _tmp3_; -#line 2955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2974 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_transformation (self, "straighten"); -#line 2956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2975 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 2957 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2976 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; -#line 2957 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2976 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 2958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2977 "/home/jens/Source/shotwell/src/Photo.vala" _vala_angle = 0.0; -#line 2960 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2960 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2960 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" if (angle) { -#line 2960 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" *angle = _vala_angle; -#line 22852 "Photo.c" +#line 22977 "Photo.c" } -#line 2960 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22856 "Photo.c" +#line 22981 "Photo.c" } -#line 2963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map; -#line 2963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = key_value_map_get_double (_tmp2_, "angle", 0.0); -#line 2963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2982 "/home/jens/Source/shotwell/src/Photo.vala" _vala_angle = _tmp3_; -#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2984 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2984 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2984 "/home/jens/Source/shotwell/src/Photo.vala" if (angle) { -#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2984 "/home/jens/Source/shotwell/src/Photo.vala" *angle = _vala_angle; -#line 22872 "Photo.c" +#line 22997 "Photo.c" } -#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2984 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22876 "Photo.c" +#line 23001 "Photo.c" } @@ -22885,40 +23010,40 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) { gdouble _tmp2_; KeyValueMap* _tmp3_; gboolean _tmp4_; -#line 2968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2987 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = key_value_map_new ("straighten"); -#line 2969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2988 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 2970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2989 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; -#line 2970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2989 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = theta; -#line 2970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2989 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_double (_tmp1_, "angle", _tmp2_); -#line 2972 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2991 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = map; -#line 2972 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2991 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_set_transformation (self, _tmp3_); -#line 2972 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2991 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_) { -#line 22905 "Photo.c" +#line 23030 "Photo.c" Alteration* _tmp5_; Alteration* _tmp6_; -#line 2973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = alteration_new ("image", "straighten"); -#line 2973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 2973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp6_); -#line 2973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp6_); -#line 22916 "Photo.c" +#line 23041 "Photo.c" } -#line 2968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2987 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 22920 "Photo.c" +#line 23045 "Photo.c" } @@ -22940,81 +23065,81 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, GdkPoint _tmp9_ = {0}; EditingToolsRedeyeInstance* _tmp47_; gint _tmp47__length1; -#line 2978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_transformation (self, "redeye"); -#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 2980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; -#line 2980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2999 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 22952 "Photo.c" +#line 23077 "Photo.c" EditingToolsRedeyeInstance* _tmp2_; EditingToolsRedeyeInstance* _tmp3_; gint _tmp3__length1; -#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = g_new0 (EditingToolsRedeyeInstance, 0); -#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3__length1 = 0; -#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { -#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp3__length1; -#line 22966 "Photo.c" +#line 23091 "Photo.c" } -#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22974 "Photo.c" +#line 23099 "Photo.c" } -#line 2983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; -#line 2983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1); -#line 2983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3002 "/home/jens/Source/shotwell/src/Photo.vala" num_points = _tmp5_; -#line 2984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3003 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = num_points; -#line 2984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3003 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp6_ > 0, "num_points > 0"); -#line 2986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3005 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = num_points; -#line 2986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3005 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_new0 (EditingToolsRedeyeInstance, _tmp7_); -#line 2986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3005 "/home/jens/Source/shotwell/src/Photo.vala" res = _tmp8_; -#line 2986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3005 "/home/jens/Source/shotwell/src/Photo.vala" res_length1 = _tmp7_; -#line 2986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3005 "/home/jens/Source/shotwell/src/Photo.vala" _res_size_ = res_length1; -#line 2988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_.x = 0; -#line 2988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3007 "/home/jens/Source/shotwell/src/Photo.vala" default_point = _tmp9_; -#line 2989 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3008 "/home/jens/Source/shotwell/src/Photo.vala" default_point.x = -1; -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3009 "/home/jens/Source/shotwell/src/Photo.vala" default_point.y = -1; -#line 23004 "Photo.c" +#line 23129 "Photo.c" { gint i = 0; -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" i = 0; -#line 23009 "Photo.c" +#line 23134 "Photo.c" { gboolean _tmp10_ = FALSE; -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = TRUE; -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 23016 "Photo.c" +#line 23141 "Photo.c" gint _tmp12_; gint _tmp13_; gchar* center_key = NULL; @@ -23057,158 +23182,158 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, gint _tmp44_; EditingToolsRedeyeInstance _tmp45_; gint _tmp46_; -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp10_) { -#line 23061 "Photo.c" +#line 23186 "Photo.c" gint _tmp11_; -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = i; -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" i = _tmp11_ + 1; -#line 23067 "Photo.c" +#line 23192 "Photo.c" } -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = FALSE; -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = i; -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = num_points; -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp12_ < _tmp13_)) { -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 23079 "Photo.c" +#line 23204 "Photo.c" } -#line 2993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = i; -#line 2993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = g_strdup_printf ("center%d", _tmp14_); -#line 2993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" center_key = _tmp15_; -#line 2994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3013 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = i; -#line 2994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3013 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = g_strdup_printf ("radius%d", _tmp16_); -#line 2994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3013 "/home/jens/Source/shotwell/src/Photo.vala" radius_key = _tmp17_; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = res; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18__length1 = res_length1; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = i; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = map; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = center_key; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = default_point; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_get_point (_tmp20_, _tmp21_, &_tmp22_, &_tmp23_); -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_[_tmp19_].center = _tmp23_; -#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = res; -#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24__length1 = res_length1; -#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = i; -#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp24_[_tmp25_]; -#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_.center; -#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_.x; -#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = default_point; -#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_.x; -#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3016 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp28_ != _tmp30_, "res[i].center.x != default_point.x"); -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3017 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = res; -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3017 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31__length1 = res_length1; -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3017 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = i; -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3017 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp31_[_tmp32_]; -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3017 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_.center; -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3017 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_.y; -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3017 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = default_point; -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3017 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_.y; -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3017 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp35_ != _tmp37_, "res[i].center.y != default_point.y"); -#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = res; -#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38__length1 = res_length1; -#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = i; -#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = map; -#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = radius_key; -#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = key_value_map_get_int (_tmp40_, _tmp41_, -1); -#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_[_tmp39_].radius = _tmp42_; -#line 3001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = res; -#line 3001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43__length1 = res_length1; -#line 3001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = i; -#line 3001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp43_[_tmp44_]; -#line 3001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = _tmp45_.radius; -#line 3001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3020 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp46_ != -1, "res[i].radius != -1"); -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (radius_key); -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (center_key); -#line 23175 "Photo.c" +#line 23300 "Photo.c" } } } -#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = res; -#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47__length1 = res_length1; -#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3023 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { -#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3023 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp47__length1; -#line 23187 "Photo.c" +#line 23312 "Photo.c" } -#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3023 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp47_; -#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3023 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3023 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23195 "Photo.c" +#line 23320 "Photo.c" } gboolean photo_has_redeye_transformations (Photo* self) { gboolean result = FALSE; gboolean _tmp0_; -#line 3007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3026 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 3008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_has_transformation (self, "redeye"); -#line 3008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 3008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23210 "Photo.c" +#line 23335 "Photo.c" } @@ -23239,111 +23364,111 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) gint _tmp21_; KeyValueMap* _tmp22_; gboolean _tmp23_; -#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3031 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3031 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (redeye != NULL); -#line 3013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_transformation (self, "redeye"); -#line 3013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3032 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 3014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; -#line 3014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3033 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 23253 "Photo.c" +#line 23378 "Photo.c" KeyValueMap* _tmp2_; KeyValueMap* _tmp3_; -#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = key_value_map_new ("redeye"); -#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3034 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3034 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp2_; -#line 3016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3035 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = map; -#line 3016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3035 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp3_, "num_points", 0); -#line 23266 "Photo.c" +#line 23391 "Photo.c" } -#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; -#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1); -#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3038 "/home/jens/Source/shotwell/src/Photo.vala" num_points = _tmp5_; -#line 3020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = num_points; -#line 3020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3039 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp6_ >= 0, "num_points >= 0"); -#line 3022 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3041 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = num_points; -#line 3022 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3041 "/home/jens/Source/shotwell/src/Photo.vala" num_points = _tmp7_ + 1; -#line 3024 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3043 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = num_points; -#line 3024 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3043 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = g_strdup_printf ("radius%d", _tmp8_ - 1); -#line 3024 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3043 "/home/jens/Source/shotwell/src/Photo.vala" radius_key = _tmp9_; -#line 3025 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3044 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = num_points; -#line 3025 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3044 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = g_strdup_printf ("center%d", _tmp10_ - 1); -#line 3025 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3044 "/home/jens/Source/shotwell/src/Photo.vala" center_key = _tmp11_; -#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = map; -#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = radius_key; -#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = *redeye; -#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_.radius; -#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3046 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp12_, _tmp13_, _tmp15_); -#line 3028 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = map; -#line 3028 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = center_key; -#line 3028 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = *redeye; -#line 3028 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_.center; -#line 3028 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_point (_tmp16_, _tmp17_, &_tmp19_); -#line 3030 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = map; -#line 3030 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = num_points; -#line 3030 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp20_, "num_points", _tmp21_); -#line 3032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = map; -#line 3032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo_set_transformation (self, _tmp22_); -#line 3032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_) { -#line 23326 "Photo.c" +#line 23451 "Photo.c" Alteration* _tmp24_; Alteration* _tmp25_; -#line 3033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = alteration_new ("image", "redeye"); -#line 3033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_; -#line 3033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3052 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); -#line 3033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3052 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp25_); -#line 23337 "Photo.c" +#line 23462 "Photo.c" } -#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3031 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (center_key); -#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3031 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (radius_key); -#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3031 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 23345 "Photo.c" +#line 23470 "Photo.c" } @@ -23352,90 +23477,90 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling Dimensions _vala_scaled_to_viewport = {0}; gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3066 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3066 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, FALSE); -#line 23358 "Photo.c" +#line 23483 "Photo.c" { PhotoRow* _tmp0_; gboolean _tmp8_ = FALSE; -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 23366 "Photo.c" +#line 23491 "Photo.c" { Scaling _tmp1_; PhotoException _tmp2_; Dimensions _tmp3_ = {0}; Dimensions _tmp4_ = {0}; gboolean _tmp5_; -#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3070 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; -#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3070 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = exceptions; -#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3070 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_locked_calculate_pixbuf_dimensions (self, &_tmp1_, _tmp2_, &_tmp3_, &_tmp4_); -#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3070 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp3_; -#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3070 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_to_viewport = _tmp4_; -#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3070 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 23385 "Photo.c" +#line 23510 "Photo.c" { PhotoRow* _tmp6_; -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 23392 "Photo.c" +#line 23517 "Photo.c" } -#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3070 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { -#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3070 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23398 "Photo.c" +#line 23523 "Photo.c" } -#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3070 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { -#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3070 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23404 "Photo.c" +#line 23529 "Photo.c" } -#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3070 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23408 "Photo.c" +#line 23533 "Photo.c" } - __finally380: + __finally392: { PhotoRow* _tmp7_; -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 23417 "Photo.c" +#line 23542 "Photo.c" } -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3068 "/home/jens/Source/shotwell/src/Photo.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 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3068 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp8_; -#line 23425 "Photo.c" +#line 23550 "Photo.c" } -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3066 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3066 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23431 "Photo.c" +#line 23556 "Photo.c" } -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3066 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3066 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23437 "Photo.c" +#line 23562 "Photo.c" } } @@ -23459,72 +23584,72 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* gint _tmp57_; gboolean _tmp63_; gboolean _tmp64_; -#line 3057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3076 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 3057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3076 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, FALSE); -#line 3059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3078 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_raw_dimensions (self, &_tmp0_); -#line 3059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3078 "/home/jens/Source/shotwell/src/Photo.vala" raw = _tmp0_; -#line 3061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = scaling_is_unscaled (scaling); -#line 3061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3080 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 23473 "Photo.c" +#line 23598 "Photo.c" Dimensions _tmp2_; Dimensions _tmp3_; -#line 3062 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3081 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = raw; -#line 3062 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3081 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp2_; -#line 3063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = raw; -#line 3063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3082 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_to_viewport = _tmp3_; -#line 3065 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 3065 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { -#line 3065 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23490 "Photo.c" +#line 23615 "Photo.c" } -#line 3065 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { -#line 3065 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23496 "Photo.c" +#line 23621 "Photo.c" } -#line 3065 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23500 "Photo.c" +#line 23625 "Photo.c" } -#line 3068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3087 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_orientation (self); -#line 3068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3087 "/home/jens/Source/shotwell/src/Photo.vala" orientation = _tmp4_; -#line 3073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3092 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&_vala_scaled_image, 0, 0); -#line 3074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3093 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&_vala_scaled_to_viewport, 0, 0); -#line 3076 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = exceptions; -#line 3076 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_exception_allows (_tmp5_, PHOTO_EXCEPTION_CROP); -#line 3076 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 23516 "Photo.c" +#line 23641 "Photo.c" Box crop = {0}; Box _tmp7_ = {0}; gboolean _tmp8_; -#line 3078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3097 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_get_raw_crop (self, &_tmp7_); -#line 3078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3097 "/home/jens/Source/shotwell/src/Photo.vala" crop = _tmp7_; -#line 3078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3097 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 23526 "Photo.c" +#line 23651 "Photo.c" Dimensions rotated_raw = {0}; Dimensions _tmp9_; PhotoException _tmp10_; @@ -23542,17 +23667,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* Dimensions _tmp32_ = {0}; PhotoException _tmp33_; gboolean _tmp34_; -#line 3081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = raw; -#line 3081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3100 "/home/jens/Source/shotwell/src/Photo.vala" rotated_raw = _tmp9_; -#line 3082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = exceptions; -#line 3082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_ORIENTATION); -#line 3082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3101 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 23554 "Photo.c" +#line 23679 "Photo.c" Orientation _tmp12_; Dimensions _tmp13_; Box _tmp14_; @@ -23560,125 +23685,125 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* Orientation _tmp16_; Dimensions _tmp17_; Dimensions _tmp18_ = {0}; -#line 3083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = orientation; -#line 3083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = raw; -#line 3083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = crop; -#line 3083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3102 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_box (_tmp12_, &_tmp13_, &_tmp14_, &_tmp15_); -#line 3083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3102 "/home/jens/Source/shotwell/src/Photo.vala" crop = _tmp15_; -#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = orientation; -#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = raw; -#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3103 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_dimensions (_tmp16_, &_tmp17_, &_tmp18_); -#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3103 "/home/jens/Source/shotwell/src/Photo.vala" rotated_raw = _tmp18_; -#line 23580 "Photo.c" +#line 23705 "Photo.c" } -#line 3088 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3107 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&crop, &_tmp19_); -#line 3088 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3107 "/home/jens/Source/shotwell/src/Photo.vala" scaling_get_scaled_dimensions (scaling, &_tmp19_, &_tmp20_); -#line 3088 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3107 "/home/jens/Source/shotwell/src/Photo.vala" box_get_scaled (&crop, &_tmp20_, &_tmp21_); -#line 3088 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3107 "/home/jens/Source/shotwell/src/Photo.vala" scaled_crop = _tmp21_; -#line 3091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3110 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&scaled_crop, &_tmp22_); -#line 3091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3110 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_to_viewport = _tmp22_; -#line 3094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3113 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = box_get_width (&crop); -#line 3094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3113 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = box_get_width (&scaled_crop); -#line 3094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3113 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_ <= _tmp25_) { -#line 23600 "Photo.c" +#line 23725 "Photo.c" gint _tmp26_; gint _tmp27_; -#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3114 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = box_get_height (&crop); -#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3114 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = box_get_height (&scaled_crop); -#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3114 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp26_ <= _tmp27_; -#line 23609 "Photo.c" +#line 23734 "Photo.c" } else { -#line 3094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3113 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = FALSE; -#line 23613 "Photo.c" +#line 23738 "Photo.c" } -#line 3094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3113 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_) { -#line 23617 "Photo.c" +#line 23742 "Photo.c" Dimensions _tmp28_; Dimensions _tmp29_ = {0}; -#line 3096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3115 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = raw; -#line 3096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3115 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp28_; -#line 3097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3116 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&crop, &_tmp29_); -#line 3097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3116 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_to_viewport = _tmp29_; -#line 3099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 3099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { -#line 3099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23634 "Photo.c" +#line 23759 "Photo.c" } -#line 3099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { -#line 3099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23640 "Photo.c" +#line 23765 "Photo.c" } -#line 3099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23644 "Photo.c" +#line 23769 "Photo.c" } -#line 3104 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3123 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&crop, &_tmp30_); -#line 3104 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3123 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&scaled_crop, &_tmp31_); -#line 3104 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3123 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_get_scaled_similar (&rotated_raw, &_tmp30_, &_tmp31_, &_tmp32_); -#line 3104 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3123 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp32_; -#line 3108 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = exceptions; -#line 3108 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = photo_exception_allows (_tmp33_, PHOTO_EXCEPTION_ORIENTATION); -#line 3108 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp34_) { -#line 23660 "Photo.c" +#line 23785 "Photo.c" Orientation _tmp35_; Dimensions _tmp36_; Dimensions _tmp37_ = {0}; -#line 3109 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3128 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = orientation; -#line 3109 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3128 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = _vala_scaled_image; -#line 3109 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3128 "/home/jens/Source/shotwell/src/Photo.vala" orientation_derotate_dimensions (_tmp35_, &_tmp36_, &_tmp37_); -#line 3109 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3128 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp37_; -#line 23672 "Photo.c" +#line 23797 "Photo.c" } } } -#line 3114 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3133 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = dimensions_has_area (&_vala_scaled_image); -#line 3114 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3133 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp38_) { -#line 23680 "Photo.c" +#line 23805 "Photo.c" Dimensions rotated_raw = {0}; Dimensions _tmp39_; PhotoException _tmp40_; @@ -23688,143 +23813,143 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* Dimensions _tmp47_; PhotoException _tmp48_; gboolean _tmp49_; -#line 3116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = raw; -#line 3116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3135 "/home/jens/Source/shotwell/src/Photo.vala" rotated_raw = _tmp39_; -#line 3117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = exceptions; -#line 3117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_ORIENTATION); -#line 3117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 23700 "Photo.c" +#line 23825 "Photo.c" Orientation _tmp42_; Dimensions _tmp43_; Dimensions _tmp44_ = {0}; -#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3137 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = orientation; -#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3137 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = raw; -#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3137 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_dimensions (_tmp42_, &_tmp43_, &_tmp44_); -#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3137 "/home/jens/Source/shotwell/src/Photo.vala" rotated_raw = _tmp44_; -#line 23712 "Photo.c" +#line 23837 "Photo.c" } -#line 3120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3139 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = rotated_raw; -#line 3120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3139 "/home/jens/Source/shotwell/src/Photo.vala" scaling_get_scaled_dimensions (scaling, &_tmp45_, &_tmp46_); -#line 3120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3139 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp46_; -#line 3121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3140 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _vala_scaled_image; -#line 3121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3140 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_to_viewport = _tmp47_; -#line 3124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3143 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = exceptions; -#line 3124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3143 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = photo_exception_allows (_tmp48_, PHOTO_EXCEPTION_ORIENTATION); -#line 3124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3143 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_) { -#line 23730 "Photo.c" +#line 23855 "Photo.c" Orientation _tmp50_; Dimensions _tmp51_; Dimensions _tmp52_ = {0}; -#line 3125 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3144 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = orientation; -#line 3125 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3144 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = _vala_scaled_image; -#line 3125 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3144 "/home/jens/Source/shotwell/src/Photo.vala" orientation_derotate_dimensions (_tmp50_, &_tmp51_, &_tmp52_); -#line 3125 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3144 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp52_; -#line 23742 "Photo.c" +#line 23867 "Photo.c" } } -#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = _vala_scaled_image; -#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _tmp54_.width; -#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = raw; -#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = _tmp56_.width; -#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp55_ >= _tmp57_) { -#line 23755 "Photo.c" +#line 23880 "Photo.c" Dimensions _tmp58_; gint _tmp59_; Dimensions _tmp60_; gint _tmp61_; -#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = _vala_scaled_image; -#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = _tmp58_.height; -#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = raw; -#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _tmp60_.height; -#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp59_ >= _tmp61_; -#line 23770 "Photo.c" +#line 23895 "Photo.c" } else { -#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = FALSE; -#line 23774 "Photo.c" +#line 23899 "Photo.c" } -#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp53_) { -#line 23778 "Photo.c" +#line 23903 "Photo.c" Dimensions _tmp62_; -#line 3130 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3149 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = raw; -#line 3130 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3149 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp62_; -#line 3132 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3151 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 3132 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3151 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { -#line 3132 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3151 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23790 "Photo.c" +#line 23915 "Photo.c" } -#line 3132 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3151 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { -#line 3132 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3151 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23796 "Photo.c" +#line 23921 "Photo.c" } -#line 3132 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3151 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23800 "Photo.c" +#line 23925 "Photo.c" } -#line 3135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = dimensions_has_area (&_vala_scaled_image); -#line 3135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3154 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp63_, "scaled_image.has_area()"); -#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = dimensions_has_area (&_vala_scaled_to_viewport); -#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp64_, "scaled_to_viewport.has_area()"); -#line 3138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3157 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 3138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3157 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { -#line 3138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3157 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23816 "Photo.c" +#line 23941 "Photo.c" } -#line 3138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3157 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { -#line 3138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3157 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23822 "Photo.c" +#line 23947 "Photo.c" } -#line 3138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3157 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23826 "Photo.c" +#line 23951 "Photo.c" } @@ -23852,141 +23977,141 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc Dimensions _tmp22_ = {0}; gboolean _tmp23_; GError * _inner_error_ = NULL; -#line 3144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3163 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3163 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 3147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = fetch_mode; -#line 3147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_backing_reader (self, _tmp0_); -#line 3147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3166 "/home/jens/Source/shotwell/src/Photo.vala" loader = _tmp1_; -#line 3150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3169 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = scaling_is_unscaled (scaling); -#line 3150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3169 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 23868 "Photo.c" +#line 23993 "Photo.c" GdkPixbuf* _tmp3_ = NULL; PhotoFileReader* _tmp4_; GdkPixbuf* _tmp5_; GdkPixbuf* _tmp6_; -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3174 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = loader; -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3174 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_file_reader_unscaled_read (_tmp4_, &_inner_error_); -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3174 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp5_; -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3174 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3174 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3174 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3174 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 23887 "Photo.c" +#line 24012 "Photo.c" } -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3174 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp3_; -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3174 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = NULL; -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3174 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp6_; -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3174 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3174 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3174 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23901 "Photo.c" +#line 24026 "Photo.c" } -#line 3160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = *scaling; -#line 3160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = exceptions; -#line 3160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_calculate_pixbuf_dimensions (self, &_tmp7_, _tmp8_, &_tmp9_, &_tmp10_); -#line 3160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3179 "/home/jens/Source/shotwell/src/Photo.vala" scaled_image = _tmp9_; -#line 3160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3179 "/home/jens/Source/shotwell/src/Photo.vala" scaled_to_viewport = _tmp10_; -#line 3160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3179 "/home/jens/Source/shotwell/src/Photo.vala" is_scaled = _tmp11_; -#line 3162 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3181 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = is_scaled; -#line 3162 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3181 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp12_) { -#line 23919 "Photo.c" +#line 24044 "Photo.c" GdkPixbuf* _tmp13_ = NULL; PhotoFileReader* _tmp14_; GdkPixbuf* _tmp15_; GdkPixbuf* _tmp16_; -#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = loader; -#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_file_reader_unscaled_read (_tmp14_, &_inner_error_); -#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp15_; -#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); -#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 23938 "Photo.c" +#line 24063 "Photo.c" } -#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp13_; -#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = NULL; -#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp16_; -#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp13_); -#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); -#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23952 "Photo.c" +#line 24077 "Photo.c" } -#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = loader; -#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_raw_dimensions (self, &_tmp18_); -#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = scaled_image; -#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo_file_reader_scaled_read (_tmp17_, &_tmp18_, &_tmp19_, &_inner_error_); -#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp20_; -#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); -#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 23972 "Photo.c" +#line 24097 "Photo.c" } -#line 3178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3197 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = pixbuf; -#line 3178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3197 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_for_pixbuf (_tmp21_, &_tmp22_); -#line 3178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3197 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = dimensions_approx_equals (&scaled_image, &_tmp22_, PHOTO_SCALING_FUDGE); -#line 3178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3197 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp23_, "scaled_image.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)"); -#line 3180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3199 "/home/jens/Source/shotwell/src/Photo.vala" result = pixbuf; -#line 3180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3199 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); -#line 3180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3199 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23988 "Photo.c" +#line 24113 "Photo.c" } @@ -23998,37 +24123,37 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota GdkPixbuf* _tmp3_; GdkPixbuf* _tmp4_; GError * _inner_error_ = NULL; -#line 3185 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3204 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3185 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3204 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; -#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = rotate; -#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_MASTER, &_inner_error_); -#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24018 "Photo.c" +#line 24143 "Photo.c" } -#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp0_; -#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24030 "Photo.c" +#line 24155 "Photo.c" } @@ -24040,37 +24165,37 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean GdkPixbuf* _tmp3_; GdkPixbuf* _tmp4_; GError * _inner_error_ = NULL; -#line 3190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; -#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = rotate; -#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_UNMODIFIED, &_inner_error_); -#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24060 "Photo.c" +#line 24185 "Photo.c" } -#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp0_; -#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24072 "Photo.c" +#line 24197 "Photo.c" } @@ -24085,93 +24210,93 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, GdkPixbuf* _tmp8_; gboolean _tmp9_; GError * _inner_error_ = NULL; -#line 3195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3214 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3214 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 24091 "Photo.c" +#line 24216 "Photo.c" { PhotoRow* _tmp0_; -#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3228 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3228 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 24098 "Photo.c" +#line 24223 "Photo.c" { Scaling _tmp1_; Dimensions _tmp2_ = {0}; Dimensions _tmp3_ = {0}; Orientation _tmp4_; -#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3229 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; -#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3229 "/home/jens/Source/shotwell/src/Photo.vala" photo_calculate_pixbuf_dimensions (self, &_tmp1_, PHOTO_EXCEPTION_NONE, &_tmp2_, &_tmp3_); -#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3229 "/home/jens/Source/shotwell/src/Photo.vala" scaled_image = _tmp2_; -#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3229 "/home/jens/Source/shotwell/src/Photo.vala" scaled_to_viewport = _tmp3_; -#line 3212 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3231 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_original_orientation (self); -#line 3212 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3231 "/home/jens/Source/shotwell/src/Photo.vala" original_orientation = _tmp4_; -#line 24116 "Photo.c" +#line 24241 "Photo.c" } - __finally381: + __finally393: { PhotoRow* _tmp5_; -#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3228 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3228 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 24125 "Photo.c" +#line 24250 "Photo.c" } -#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3228 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3228 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3228 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24133 "Photo.c" +#line 24258 "Photo.c" } } -#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3235 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = *scaling; -#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3235 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = fetch_mode; -#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3235 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_load_raw_pixbuf (self, &_tmp6_, PHOTO_EXCEPTION_NONE, _tmp7_, &_inner_error_); -#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3235 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp8_; -#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3235 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3235 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3235 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24150 "Photo.c" +#line 24275 "Photo.c" } -#line 3222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = rotate; -#line 3222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3241 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp9_) { -#line 24156 "Photo.c" +#line 24281 "Photo.c" GdkPixbuf* _tmp10_; GdkPixbuf* _tmp11_; -#line 3223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = pixbuf; -#line 3223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = orientation_rotate_pixbuf (original_orientation, _tmp10_); -#line 3223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3242 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3242 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp11_; -#line 24167 "Photo.c" +#line 24292 "Photo.c" } -#line 3232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3251 "/home/jens/Source/shotwell/src/Photo.vala" result = pixbuf; -#line 3232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3251 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24173 "Photo.c" +#line 24298 "Photo.c" } @@ -24183,35 +24308,35 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; GError * _inner_error_ = NULL; -#line 3235 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3254 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 3235 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3254 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; -#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_get_pixbuf_with_options (self, &_tmp1_, PHOTO_EXCEPTION_NONE, BACKING_FETCH_MODE_BASELINE, &_inner_error_); -#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp2_; -#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24201 "Photo.c" +#line 24326 "Photo.c" } -#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp0_; -#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24213 "Photo.c" +#line 24338 "Photo.c" } @@ -24231,34 +24356,34 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE * it moves to the head of the LRU. */ static gpointer _photo_cached_pixbuf_ref0 (gpointer self) { -#line 3271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_cached_pixbuf_ref (self) : NULL; -#line 24235 "Photo.c" +#line 24360 "Photo.c" } static gboolean _photo_trim_source_pixbuf_cache_gsource_func (gpointer self) { gboolean result; result = photo_trim_source_pixbuf_cache (); -#line 3323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3342 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24244 "Photo.c" +#line 24369 "Photo.c" } static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, GError** error) { GdkPixbuf* result = NULL; GError * _inner_error_ = NULL; -#line 3254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3273 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((locate == NULL) || IS_PHOTO (locate), NULL); -#line 24253 "Photo.c" +#line 24378 "Photo.c" { GeeLinkedList* _tmp0_; -#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_source_pixbuf_cache; -#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&__lock_photo_source_pixbuf_cache); -#line 24260 "Photo.c" +#line 24385 "Photo.c" { PhotoCachedPixbuf* found = NULL; gdouble min_elapsed = 0.0; @@ -24278,21 +24403,21 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G GdkPixbuf* _tmp69_ = NULL; PhotoCachedPixbuf* _tmp70_; GdkPixbuf* _tmp73_; -#line 3256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3275 "/home/jens/Source/shotwell/src/Photo.vala" found = NULL; -#line 3260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3279 "/home/jens/Source/shotwell/src/Photo.vala" min_elapsed = DBL_MAX; -#line 3261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3280 "/home/jens/Source/shotwell/src/Photo.vala" count = 0; -#line 3262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_source_pixbuf_cache; -#line 3262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 3262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3281 "/home/jens/Source/shotwell/src/Photo.vala" iter = _tmp2_; -#line 3263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 24294 "Photo.c" +#line 24419 "Photo.c" GeeIterator* _tmp3_; gboolean _tmp4_; PhotoCachedPixbuf* cached_pixbuf = NULL; @@ -24305,236 +24430,236 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G gdouble _tmp10_; gboolean _tmp11_ = FALSE; Photo* _tmp12_; -#line 3263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = iter; -#line 3263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 3263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp4_) { -#line 3263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 24315 "Photo.c" +#line 24440 "Photo.c" } -#line 3264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = iter; -#line 3264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 3264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3283 "/home/jens/Source/shotwell/src/Photo.vala" cached_pixbuf = (PhotoCachedPixbuf*) _tmp6_; -#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = cached_pixbuf; -#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->last_touched; -#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = g_timer_elapsed (_tmp8_, NULL); -#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = trunc (_tmp9_); -#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3285 "/home/jens/Source/shotwell/src/Photo.vala" elapsed = _tmp10_ + 1; -#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = locate; -#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_ != NULL) { -#line 24337 "Photo.c" +#line 24462 "Photo.c" PhotoCachedPixbuf* _tmp13_; Photo* _tmp14_; Photo* _tmp15_; gboolean _tmp16_; -#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = cached_pixbuf; -#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->photo; -#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = locate; -#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource)); -#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp16_; -#line 24352 "Photo.c" +#line 24477 "Photo.c" } else { -#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; -#line 24356 "Photo.c" +#line 24481 "Photo.c" } -#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 24360 "Photo.c" +#line 24485 "Photo.c" GeeIterator* _tmp17_; PhotoCachedPixbuf* _tmp18_; PhotoCachedPixbuf* _tmp19_; gint _tmp20_; -#line 3270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = iter; -#line 3270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3289 "/home/jens/Source/shotwell/src/Photo.vala" gee_iterator_remove (_tmp17_); -#line 3271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = cached_pixbuf; -#line 3271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _photo_cached_pixbuf_ref0 (_tmp18_); -#line 3271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 3271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" found = _tmp19_; -#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = count; -#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3293 "/home/jens/Source/shotwell/src/Photo.vala" count = _tmp20_ + 1; -#line 24381 "Photo.c" +#line 24506 "Photo.c" } else { gdouble _tmp21_; -#line 3275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = elapsed; -#line 3275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3294 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_ >= ((gdouble) PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC)) { -#line 24388 "Photo.c" +#line 24513 "Photo.c" GeeIterator* _tmp22_; -#line 3276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = iter; -#line 3276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3295 "/home/jens/Source/shotwell/src/Photo.vala" gee_iterator_remove (_tmp22_); -#line 24394 "Photo.c" +#line 24519 "Photo.c" } else { gint _tmp23_; -#line 3277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = count; -#line 3277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3296 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_ >= PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT) { -#line 24401 "Photo.c" +#line 24526 "Photo.c" GeeIterator* _tmp24_; -#line 3278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = iter; -#line 3278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" gee_iterator_remove (_tmp24_); -#line 24407 "Photo.c" +#line 24532 "Photo.c" } else { gdouble _tmp25_; gdouble _tmp26_; gdouble _tmp27_; gint _tmp28_; -#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3301 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = elapsed; -#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3301 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = min_elapsed; -#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3301 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = MIN (_tmp25_, _tmp26_); -#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3301 "/home/jens/Source/shotwell/src/Photo.vala" min_elapsed = _tmp27_; -#line 3283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = count; -#line 3283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3302 "/home/jens/Source/shotwell/src/Photo.vala" count = _tmp28_ + 1; -#line 24425 "Photo.c" +#line 24550 "Photo.c" } } } -#line 3263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (cached_pixbuf); -#line 24431 "Photo.c" +#line 24556 "Photo.c" } -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = found; -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp31_ == NULL) { -#line 24437 "Photo.c" +#line 24562 "Photo.c" Photo* _tmp32_; -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = locate; -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp32_ != NULL; -#line 24443 "Photo.c" +#line 24568 "Photo.c" } else { -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = FALSE; -#line 24447 "Photo.c" +#line 24572 "Photo.c" } -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp30_) { -#line 24451 "Photo.c" +#line 24576 "Photo.c" gboolean _tmp33_; -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = keep; -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp33_; -#line 24457 "Photo.c" +#line 24582 "Photo.c" } else { -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = FALSE; -#line 24461 "Photo.c" +#line 24586 "Photo.c" } -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_) { -#line 24465 "Photo.c" +#line 24590 "Photo.c" GdkPixbuf* _tmp34_ = NULL; Photo* _tmp35_; Scaling _tmp36_ = {0}; GdkPixbuf* _tmp37_; Photo* _tmp38_; PhotoCachedPixbuf* _tmp39_; -#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = locate; -#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3309 "/home/jens/Source/shotwell/src/Photo.vala" scaling_for_original (&_tmp36_); -#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = photo_load_raw_pixbuf (_tmp35_, &_tmp36_, PHOTO_EXCEPTION_ALL, BACKING_FETCH_MODE_SOURCE, &_inner_error_); -#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp37_; -#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3309 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3309 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (iter); -#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3309 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 24486 "Photo.c" - goto __finally382; +#line 24611 "Photo.c" + goto __finally394; } -#line 3289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = locate; -#line 3289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = photo_cached_pixbuf_new (_tmp38_, _tmp34_); -#line 3289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 3289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" found = _tmp39_; -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp34_); -#line 24499 "Photo.c" +#line 24624 "Photo.c" } else { PhotoCachedPixbuf* _tmp40_; -#line 3291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = found; -#line 3291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3310 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp40_ != NULL) { -#line 24506 "Photo.c" +#line 24631 "Photo.c" PhotoCachedPixbuf* _tmp41_; GTimer* _tmp42_; -#line 3293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = found; -#line 3293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_->last_touched; -#line 3293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3312 "/home/jens/Source/shotwell/src/Photo.vala" g_timer_start (_tmp42_); -#line 24515 "Photo.c" +#line 24640 "Photo.c" } } -#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = found; -#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3316 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp44_ != NULL) { -#line 24522 "Photo.c" +#line 24647 "Photo.c" gboolean _tmp45_; -#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = keep; -#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp45_; -#line 24528 "Photo.c" +#line 24653 "Photo.c" } else { -#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = FALSE; -#line 24532 "Photo.c" +#line 24657 "Photo.c" } -#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3316 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp43_) { -#line 24536 "Photo.c" +#line 24661 "Photo.c" GeeLinkedList* _tmp46_; PhotoCachedPixbuf* _tmp47_; PhotoCachedPixbuf* _tmp48_; @@ -24542,157 +24667,157 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G gdouble _tmp50_; gdouble _tmp51_; gdouble _tmp52_; -#line 3298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3317 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = photo_source_pixbuf_cache; -#line 3298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3317 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = found; -#line 3298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3317 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp47_); -#line 3303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = found; -#line 3303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = _tmp48_->last_touched; -#line 3303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = g_timer_elapsed (_tmp49_, NULL); -#line 3303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = min_elapsed; -#line 3303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = MIN (_tmp50_, _tmp51_); -#line 3303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" min_elapsed = _tmp52_; -#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 24564 "Photo.c" +#line 24689 "Photo.c" GeeLinkedList* _tmp53_; gint _tmp54_; gint _tmp55_; GeeLinkedList* _tmp56_; gpointer _tmp57_; PhotoCachedPixbuf* _tmp58_; -#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = photo_source_pixbuf_cache; -#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _tmp54_; -#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp55_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) { -#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 24581 "Photo.c" +#line 24706 "Photo.c" } -#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3327 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = photo_source_pixbuf_cache; -#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3327 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_DEQUE, GeeDeque)); -#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3327 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = (PhotoCachedPixbuf*) _tmp57_; -#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3327 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (_tmp58_); -#line 24591 "Photo.c" +#line 24716 "Photo.c" } } -#line 3312 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = photo_discard_source_id; -#line 3312 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp59_ != ((guint) 0)) { -#line 24598 "Photo.c" +#line 24723 "Photo.c" guint _tmp60_; -#line 3313 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3332 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = photo_discard_source_id; -#line 3313 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3332 "/home/jens/Source/shotwell/src/Photo.vala" g_source_remove (_tmp60_); -#line 3314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3333 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_source_id = (guint) 0; -#line 24606 "Photo.c" +#line 24731 "Photo.c" } -#line 3318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3337 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = photo_source_pixbuf_cache; -#line 3318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3337 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 3318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3337 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = _tmp62_; -#line 3318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3337 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp63_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) { -#line 24616 "Photo.c" +#line 24741 "Photo.c" gdouble _tmp64_; guint retry_sec = 0U; gdouble _tmp65_; gdouble _tmp66_; guint _tmp67_; guint _tmp68_; -#line 3319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = min_elapsed; -#line 3319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3338 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp64_ >= 0.0, "min_elapsed >= 0.0"); -#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = min_elapsed; -#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = trunc (_tmp65_); -#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3341 "/home/jens/Source/shotwell/src/Photo.vala" retry_sec = PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC - ((guint) _tmp66_); -#line 3323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = retry_sec; -#line 3323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = g_timeout_add_seconds_full (G_PRIORITY_LOW, _tmp67_, _photo_trim_source_pixbuf_cache_gsource_func, NULL, NULL); -#line 3323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3342 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_source_id = _tmp68_; -#line 24639 "Photo.c" +#line 24764 "Photo.c" } -#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = found; -#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp70_ != NULL) { -#line 24645 "Photo.c" +#line 24770 "Photo.c" PhotoCachedPixbuf* _tmp71_; GdkPixbuf* _tmp72_; -#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = found; -#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = _tmp71_->pixbuf; -#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = _tmp72_; -#line 24654 "Photo.c" +#line 24779 "Photo.c" } else { -#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = NULL; -#line 24658 "Photo.c" +#line 24783 "Photo.c" } -#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = _g_object_ref0 (_tmp69_); -#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp73_; -#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (iter); -#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 24668 "Photo.c" +#line 24793 "Photo.c" { GeeLinkedList* _tmp74_; -#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = photo_source_pixbuf_cache; -#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache); -#line 24675 "Photo.c" +#line 24800 "Photo.c" } -#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24679 "Photo.c" +#line 24804 "Photo.c" } - __finally382: + __finally394: { GeeLinkedList* _tmp75_; -#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = photo_source_pixbuf_cache; -#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache); -#line 24688 "Photo.c" +#line 24813 "Photo.c" } -#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24694 "Photo.c" +#line 24819 "Photo.c" } } @@ -24703,48 +24828,48 @@ static gboolean photo_trim_source_pixbuf_cache (void) { { GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; -#line 3332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3351 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_run_source_pixbuf_cache (NULL, FALSE, &_inner_error_); -#line 3332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3351 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 3332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3351 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 3332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3351 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 24713 "Photo.c" - goto __catch383_g_error; +#line 24838 "Photo.c" + goto __catch395_g_error; } } - goto __finally383; - __catch383_g_error: + goto __finally395; + __catch395_g_error: { GError* err = NULL; -#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3350 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3350 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3350 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 24727 "Photo.c" +#line 24852 "Photo.c" } - __finally383: -#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" + __finally395: +#line 3350 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 24732 "Photo.c" +#line 24857 "Photo.c" gboolean _tmp2_ = FALSE; -#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3350 "/home/jens/Source/shotwell/src/Photo.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 3331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3350 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3350 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp2_; -#line 24740 "Photo.c" +#line 24865 "Photo.c" } -#line 3336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3355 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 3336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3355 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24746 "Photo.c" +#line 24871 "Photo.c" } @@ -24759,29 +24884,29 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) { GdkPixbuf* _tmp1_; GdkPixbuf* _tmp2_; GError * _inner_error_ = NULL; -#line 3344 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3363 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_run_source_pixbuf_cache (self, TRUE, &_inner_error_); -#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp1_; -#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3364 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3364 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3364 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24773 "Photo.c" +#line 24898 "Photo.c" } -#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gdk_pixbuf_copy (_tmp0_); -#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3364 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3364 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3364 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24783 "Photo.c" +#line 24908 "Photo.c" } @@ -24790,46 +24915,46 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) { */ void photo_discard_prefetched (Photo* self) { GError * _inner_error_ = NULL; -#line 3351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3370 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 24794 "Photo.c" +#line 24919 "Photo.c" { GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; -#line 3353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3372 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_run_source_pixbuf_cache (self, FALSE, &_inner_error_); -#line 3353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3372 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 3353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3372 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 3353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3372 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 24806 "Photo.c" - goto __catch384_g_error; +#line 24931 "Photo.c" + goto __catch396_g_error; } } - goto __finally384; - __catch384_g_error: + goto __finally396; + __catch396_g_error: { GError* err = NULL; -#line 3352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3371 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 3352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3371 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 3352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3371 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 24820 "Photo.c" +#line 24945 "Photo.c" } - __finally384: -#line 3352 "/home/jens/Source/shotwell/src/Photo.vala" + __finally396: +#line 3371 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3371 "/home/jens/Source/shotwell/src/Photo.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 3352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3371 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 3352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3371 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 24831 "Photo.c" +#line 24956 "Photo.c" } } @@ -24881,117 +25006,117 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx gboolean _tmp101_ = FALSE; gboolean _tmp102_; GError * _inner_error_ = NULL; -#line 3369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3388 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3388 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_develop_raw_photos_to_files (); -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_) { -#line 24893 "Photo.c" +#line 25018 "Photo.c" PhotoFileFormat _tmp5_; -#line 3383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_get_master_file_format (self); -#line 3383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp5_ == PHOTO_FILE_FORMAT_RAW; -#line 24899 "Photo.c" +#line 25024 "Photo.c" } else { -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = FALSE; -#line 24903 "Photo.c" +#line 25028 "Photo.c" } -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 24907 "Photo.c" +#line 25032 "Photo.c" gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; BackingFetchMode _tmp8_; -#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = fetch_mode; -#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ == BACKING_FETCH_MODE_BASELINE) { -#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = TRUE; -#line 24917 "Photo.c" +#line 25042 "Photo.c" } else { BackingFetchMode _tmp9_; -#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = fetch_mode; -#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp9_ == BACKING_FETCH_MODE_UNMODIFIED; -#line 24924 "Photo.c" +#line 25049 "Photo.c" } -#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { -#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = TRUE; -#line 24930 "Photo.c" +#line 25055 "Photo.c" } else { BackingFetchMode _tmp10_; -#line 3385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3404 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = fetch_mode; -#line 3385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3404 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp10_ == BACKING_FETCH_MODE_SOURCE; -#line 24937 "Photo.c" +#line 25062 "Photo.c" } -#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp6_; -#line 24941 "Photo.c" +#line 25066 "Photo.c" } else { -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 24945 "Photo.c" +#line 25070 "Photo.c" } -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 24949 "Photo.c" +#line 25074 "Photo.c" RawDeveloper _tmp11_; gboolean _tmp12_; -#line 3386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_get_raw_developer (self); -#line 3386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_is_raw_developer_complete (self, _tmp11_); -#line 3386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = !_tmp12_; -#line 24958 "Photo.c" +#line 25083 "Photo.c" } else { -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 24962 "Photo.c" +#line 25087 "Photo.c" } -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 24966 "Photo.c" +#line 25091 "Photo.c" RawDeveloper _tmp13_; -#line 3387 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3406 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_get_raw_developer (self); -#line 3387 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_raw_developer (self, _tmp13_); -#line 24972 "Photo.c" +#line 3406 "/home/jens/Source/shotwell/src/Photo.vala" + photo_set_raw_developer (self, _tmp13_, TRUE); +#line 25097 "Photo.c" } -#line 3392 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3411 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&original, 0, 0); -#line 3393 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3412 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&scaled, 0, 0); -#line 3394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3413 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = NULL; -#line 3394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3413 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances_length1 = 0; -#line 3394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3413 "/home/jens/Source/shotwell/src/Photo.vala" _redeye_instances_size_ = redeye_instances_length1; -#line 3397 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3416 "/home/jens/Source/shotwell/src/Photo.vala" transformer = NULL; -#line 24986 "Photo.c" +#line 25111 "Photo.c" { PhotoRow* _tmp14_; -#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3419 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3419 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 24993 "Photo.c" +#line 25118 "Photo.c" { Dimensions _tmp15_ = {0}; PhotoException _tmp16_; @@ -25009,201 +25134,201 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx gboolean _tmp28_; gboolean _tmp29_; Orientation _tmp31_; -#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3420 "/home/jens/Source/shotwell/src/Photo.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ALL, &_tmp15_); -#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3420 "/home/jens/Source/shotwell/src/Photo.vala" original = _tmp15_; -#line 3402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3421 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = exceptions; -#line 3402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3421 "/home/jens/Source/shotwell/src/Photo.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp16_, &_tmp17_); -#line 3402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3421 "/home/jens/Source/shotwell/src/Photo.vala" scaling_get_scaled_dimensions (scaling, &_tmp17_, &_tmp18_); -#line 3402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3421 "/home/jens/Source/shotwell/src/Photo.vala" scaled = _tmp18_; -#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3422 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = scaled; -#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3422 "/home/jens/Source/shotwell/src/Photo.vala" scaled_to_viewport = _tmp19_; -#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3424 "/home/jens/Source/shotwell/src/Photo.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp20_); -#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3424 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = scaled; -#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3424 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = dimensions_equals (&_tmp20_, &_tmp21_); -#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3424 "/home/jens/Source/shotwell/src/Photo.vala" is_scaled = !_tmp22_; -#line 3407 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3426 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = photo_get_raw_redeye_instances (self, &_tmp23_); -#line 3407 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3426 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = (g_free (redeye_instances), NULL); -#line 3407 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3426 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = _tmp24_; -#line 3407 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3426 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances_length1 = _tmp23_; -#line 3407 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3426 "/home/jens/Source/shotwell/src/Photo.vala" _redeye_instances_size_ = redeye_instances_length1; -#line 3409 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3428 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = photo_get_raw_crop (self, &_tmp25_); -#line 3409 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3428 "/home/jens/Source/shotwell/src/Photo.vala" crop = _tmp25_; -#line 3409 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3428 "/home/jens/Source/shotwell/src/Photo.vala" is_cropped = _tmp26_; -#line 3411 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3430 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = photo_get_raw_straighten (self, &_tmp27_); -#line 3411 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3430 "/home/jens/Source/shotwell/src/Photo.vala" straightening_angle = _tmp27_; -#line 3411 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3430 "/home/jens/Source/shotwell/src/Photo.vala" is_straightened = _tmp28_; -#line 3413 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3432 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = photo_has_color_adjustments (self); -#line 3413 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3432 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_) { -#line 25061 "Photo.c" +#line 25186 "Photo.c" PixelTransformer* _tmp30_; -#line 3414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3433 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = photo_get_pixel_transformer (self); -#line 3414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3433 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (transformer); -#line 3414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3433 "/home/jens/Source/shotwell/src/Photo.vala" transformer = _tmp30_; -#line 25069 "Photo.c" +#line 25194 "Photo.c" } -#line 3416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = photo_get_orientation (self); -#line 3416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" orientation = _tmp31_; -#line 25075 "Photo.c" +#line 25200 "Photo.c" } - __finally385: + __finally397: { PhotoRow* _tmp32_; -#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3419 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = self->row; -#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3419 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 25084 "Photo.c" +#line 25209 "Photo.c" } -#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3419 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3419 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3419 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (transformer); -#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3419 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = (g_free (redeye_instances), NULL); -#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3419 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 25096 "Photo.c" +#line 25221 "Photo.c" } } -#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3442 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = photo_get_prefetched_copy (self, &_inner_error_); -#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3442 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp33_; -#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3442 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3442 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3442 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (transformer); -#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3442 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = (g_free (redeye_instances), NULL); -#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3442 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 25113 "Photo.c" +#line 25238 "Photo.c" } -#line 3430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = exceptions; -#line 3430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_exception_allows (_tmp34_, PHOTO_EXCEPTION_REDEYE); -#line 3430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp35_) { -#line 25121 "Photo.c" +#line 25246 "Photo.c" EditingToolsRedeyeInstance* _tmp36_; gint _tmp36__length1; -#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3454 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = redeye_instances; -#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3454 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36__length1 = redeye_instances_length1; -#line 25128 "Photo.c" +#line 25253 "Photo.c" { EditingToolsRedeyeInstance* instance_collection = NULL; gint instance_collection_length1 = 0; gint _instance_collection_size_ = 0; gint instance_it = 0; -#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3454 "/home/jens/Source/shotwell/src/Photo.vala" instance_collection = _tmp36_; -#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3454 "/home/jens/Source/shotwell/src/Photo.vala" instance_collection_length1 = _tmp36__length1; -#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3454 "/home/jens/Source/shotwell/src/Photo.vala" for (instance_it = 0; instance_it < _tmp36__length1; instance_it = instance_it + 1) { -#line 25140 "Photo.c" +#line 25265 "Photo.c" EditingToolsRedeyeInstance instance = {0}; -#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3454 "/home/jens/Source/shotwell/src/Photo.vala" instance = instance_collection[instance_it]; -#line 25144 "Photo.c" +#line 25269 "Photo.c" { GdkPixbuf* _tmp37_; EditingToolsRedeyeInstance _tmp38_; GdkPixbuf* _tmp39_; -#line 3436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = pixbuf; -#line 3436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = instance; -#line 3436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = photo_do_redeye (self, _tmp37_, &_tmp38_); -#line 3436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3455 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp39_; -#line 25159 "Photo.c" +#line 25284 "Photo.c" } } } } -#line 3444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3463 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = exceptions; -#line 3444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3463 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_STRAIGHTEN); -#line 3444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3463 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 25170 "Photo.c" +#line 25295 "Photo.c" gboolean _tmp42_; -#line 3448 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = is_straightened; -#line 3448 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp42_) { -#line 25176 "Photo.c" +#line 25301 "Photo.c" GdkPixbuf* _tmp43_; gdouble _tmp44_; GdkPixbuf* _tmp45_; -#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = pixbuf; -#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = straightening_angle; -#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = rotate_arb (_tmp43_, _tmp44_); -#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp45_; -#line 25190 "Photo.c" +#line 25315 "Photo.c" } } -#line 3458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3477 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = exceptions; -#line 3458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3477 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = photo_exception_allows (_tmp46_, PHOTO_EXCEPTION_CROP); -#line 3458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3477 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp47_) { -#line 25199 "Photo.c" +#line 25324 "Photo.c" gboolean _tmp48_; -#line 3462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3481 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = is_cropped; -#line 3462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3481 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp48_) { -#line 25205 "Photo.c" +#line 25330 "Photo.c" Box _tmp49_; gint _tmp50_; GdkPixbuf* _tmp51_; @@ -25240,256 +25365,256 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx gint _tmp82_; gint _tmp83_; GdkPixbuf* _tmp84_; -#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3486 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = crop; -#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3486 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = _tmp49_.left; -#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3486 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = pixbuf; -#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3486 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = gdk_pixbuf_get_width (_tmp51_); -#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3486 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp52_; -#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3486 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = CLAMP (_tmp50_, 0, _tmp53_ - 2); -#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3486 "/home/jens/Source/shotwell/src/Photo.vala" crop.left = _tmp54_; -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = crop; -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = _tmp55_.top; -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = pixbuf; -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = gdk_pixbuf_get_height (_tmp57_); -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = _tmp58_; -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = CLAMP (_tmp56_, 0, _tmp59_ - 2); -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" crop.top = _tmp60_; -#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3489 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = crop; -#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3489 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = _tmp61_.right; -#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3489 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = crop; -#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3489 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = _tmp63_.left; -#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3489 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = pixbuf; -#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3489 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = gdk_pixbuf_get_width (_tmp65_); -#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3489 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = _tmp66_; -#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3489 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = CLAMP (_tmp62_, _tmp64_ + 1, _tmp67_ - 1); -#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3489 "/home/jens/Source/shotwell/src/Photo.vala" crop.right = _tmp68_; -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3490 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = crop; -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3490 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = _tmp69_.bottom; -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3490 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = crop; -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3490 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = _tmp71_.top; -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3490 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = pixbuf; -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3490 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = gdk_pixbuf_get_height (_tmp73_); -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3490 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = _tmp74_; -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3490 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = CLAMP (_tmp70_, _tmp72_ + 1, _tmp75_ - 1); -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3490 "/home/jens/Source/shotwell/src/Photo.vala" crop.bottom = _tmp76_; -#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = pixbuf; -#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = crop; -#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = _tmp78_.left; -#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = crop; -#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = _tmp80_.top; -#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = box_get_width (&crop); -#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = box_get_height (&crop); -#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = gdk_pixbuf_new_subpixbuf (_tmp77_, _tmp79_, _tmp81_, _tmp82_, _tmp83_); -#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp84_; -#line 25326 "Photo.c" +#line 25451 "Photo.c" } } -#line 3483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = exceptions; -#line 3483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = photo_exception_allows (_tmp85_, PHOTO_EXCEPTION_ORIENTATION); -#line 3483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3502 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp86_) { -#line 25335 "Photo.c" +#line 25460 "Photo.c" GdkPixbuf* _tmp87_; GdkPixbuf* _tmp88_; -#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3506 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = pixbuf; -#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3506 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = orientation_rotate_pixbuf (orientation, _tmp87_); -#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3506 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3506 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp88_; -#line 25346 "Photo.c" +#line 25471 "Photo.c" } -#line 3494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3513 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = is_scaled; -#line 3494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3513 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp89_) { -#line 25352 "Photo.c" +#line 25477 "Photo.c" GdkPixbuf* _tmp90_; Dimensions _tmp91_; gint _tmp92_; Dimensions _tmp93_; gint _tmp94_; GdkPixbuf* _tmp95_; -#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3517 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = pixbuf; -#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3517 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = scaled_to_viewport; -#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3517 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = _tmp91_.width; -#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3517 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = scaled_to_viewport; -#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3517 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = _tmp93_.height; -#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3517 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = gdk_pixbuf_scale_simple (_tmp90_, _tmp92_, _tmp94_, GDK_INTERP_BILINEAR); -#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3517 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3517 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp95_; -#line 25375 "Photo.c" +#line 25500 "Photo.c" } -#line 3506 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3525 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = exceptions; -#line 3506 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3525 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = photo_exception_allows (_tmp96_, PHOTO_EXCEPTION_ADJUST); -#line 3506 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3525 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp97_) { -#line 25383 "Photo.c" +#line 25508 "Photo.c" PixelTransformer* _tmp98_; -#line 3510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3529 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = transformer; -#line 3510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3529 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp98_ != NULL) { -#line 25389 "Photo.c" +#line 25514 "Photo.c" PixelTransformer* _tmp99_; GdkPixbuf* _tmp100_; -#line 3511 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3530 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = transformer; -#line 3511 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3530 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = pixbuf; -#line 3511 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3530 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformer_transform_pixbuf (_tmp99_, _tmp100_, NULL); -#line 25398 "Photo.c" +#line 25523 "Photo.c" } } -#line 3520 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3539 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = is_scaled; -#line 3520 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3539 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp102_) { -#line 25405 "Photo.c" +#line 25530 "Photo.c" gboolean _tmp103_; -#line 3520 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3539 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = is_straightened; -#line 3520 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3539 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = !_tmp103_; -#line 25411 "Photo.c" +#line 25536 "Photo.c" } else { -#line 3520 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3539 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = FALSE; -#line 25415 "Photo.c" +#line 25540 "Photo.c" } -#line 3520 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3539 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp101_) { -#line 25419 "Photo.c" +#line 25544 "Photo.c" GdkPixbuf* _tmp104_; Dimensions _tmp105_ = {0}; gboolean _tmp106_; -#line 3521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3540 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = pixbuf; -#line 3521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3540 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_for_pixbuf (_tmp104_, &_tmp105_); -#line 3521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3540 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = dimensions_approx_equals (&scaled_to_viewport, &_tmp105_, PHOTO_SCALING_FUDGE); -#line 3521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3540 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp106_, "scaled_to_viewport.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)"); -#line 25431 "Photo.c" +#line 25556 "Photo.c" } -#line 3529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" result = pixbuf; -#line 3529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (transformer); -#line 3529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = (g_free (redeye_instances), NULL); -#line 3529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25441 "Photo.c" +#line 25566 "Photo.c" } static gboolean photo_real_has_user_generated_metadata (Photo* self) { gboolean _tmp0_ = FALSE; -#line 3537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("Type `%s' does not implement abstract method `photo_has_user_generated_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 3537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp0_; -#line 25451 "Photo.c" +#line 25576 "Photo.c" } gboolean photo_has_user_generated_metadata (Photo* self) { -#line 3537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 3537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" return PHOTO_GET_CLASS (self)->has_user_generated_metadata (self); -#line 25460 "Photo.c" +#line 25585 "Photo.c" } static void photo_real_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) { -#line 3541 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3560 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("Type `%s' does not implement abstract method `photo_set_user_metadata_for_export'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 3541 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3560 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 25469 "Photo.c" +#line 25594 "Photo.c" } void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) { -#line 3541 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3560 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3541 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3560 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->set_user_metadata_for_export (self, metadata); -#line 25478 "Photo.c" +#line 25603 "Photo.c" } gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { gchar* result = NULL; PhotoFileFormat* _tmp0_; -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3549 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file_format; -#line 3549 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 25491 "Photo.c" +#line 25616 "Photo.c" PhotoFileFormat* _tmp1_; PhotoFileFormatProperties* _tmp2_; PhotoFileFormatProperties* _tmp3_; @@ -25499,45 +25624,45 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { GFile* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file_format; -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_format_get_properties (*_tmp1_); -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_file_format_properties_convert_file_extension (_tmp3_, _tmp5_); -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_file_get_basename (_tmp7_); -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp7_); -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp5_); -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (_tmp3_); -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp9_; -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25529 "Photo.c" +#line 25654 "Photo.c" } else { PhotoFileFormat _tmp10_; gboolean _tmp11_; -#line 3552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_get_file_format (self); -#line 3552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_file_format_can_write (_tmp10_); -#line 3552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 25539 "Photo.c" +#line 25664 "Photo.c" PhotoFileFormat _tmp12_; PhotoFileFormatProperties* _tmp13_; PhotoFileFormatProperties* _tmp14_; @@ -25547,35 +25672,35 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { GFile* _tmp18_; gchar* _tmp19_; gchar* _tmp20_; -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_get_file_format (self); -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_file_format_get_properties (_tmp12_); -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_; -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_file_format_properties_convert_file_extension (_tmp14_, _tmp16_); -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_; -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = g_file_get_basename (_tmp18_); -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp18_); -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp16_); -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (_tmp14_); -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp20_; -#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25577 "Photo.c" +#line 25702 "Photo.c" } else { PhotoFileFormat _tmp21_; PhotoFileFormatProperties* _tmp22_; @@ -25586,35 +25711,35 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { GFile* _tmp27_; gchar* _tmp28_; gchar* _tmp29_; -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_file_format_get_system_default_format (); -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = photo_file_format_get_properties (_tmp21_); -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_; -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_; -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = photo_file_format_properties_convert_file_extension (_tmp23_, _tmp25_); -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_; -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = g_file_get_basename (_tmp27_); -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp28_; -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp27_); -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp25_); -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (_tmp23_); -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp29_; -#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25616 "Photo.c" +#line 25741 "Photo.c" } } } @@ -25668,473 +25793,473 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole PhotoFileMetadataWriter* _tmp101_; PhotoMetadata* _tmp102_; GError * _inner_error_ = NULL; -#line 3562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3581 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 3562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3581 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 3565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3584 "/home/jens/Source/shotwell/src/Photo.vala" export_reader = NULL; -#line 3566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3585 "/home/jens/Source/shotwell/src/Photo.vala" is_master = TRUE; -#line 25678 "Photo.c" +#line 25803 "Photo.c" { PhotoBackingReaders* _tmp0_; -#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 25685 "Photo.c" +#line 25810 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoBackingReaders* _tmp2_; PhotoFileReader* _tmp3_; -#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->readers; -#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->editable; -#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 25696 "Photo.c" +#line 25821 "Photo.c" PhotoBackingReaders* _tmp4_; PhotoFileReader* _tmp5_; PhotoFileFormat _tmp6_; gboolean _tmp7_; -#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->editable; -#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_file_format_can_write_metadata (_tmp6_); -#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp7_; -#line 25711 "Photo.c" +#line 25836 "Photo.c" } else { -#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 25715 "Photo.c" +#line 25840 "Photo.c" } -#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 25719 "Photo.c" +#line 25844 "Photo.c" PhotoBackingReaders* _tmp8_; PhotoFileReader* _tmp9_; PhotoFileReader* _tmp10_; -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->priv->readers; -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_->editable; -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _photo_file_adapter_ref0 (_tmp9_); -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" export_reader = _tmp10_; -#line 3570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3589 "/home/jens/Source/shotwell/src/Photo.vala" is_master = FALSE; -#line 25735 "Photo.c" +#line 25860 "Photo.c" } else { gboolean _tmp11_ = FALSE; PhotoBackingReaders* _tmp12_; PhotoFileReader* _tmp13_; -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->readers; -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_->developer; -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ != NULL) { -#line 25746 "Photo.c" +#line 25871 "Photo.c" PhotoBackingReaders* _tmp14_; PhotoFileReader* _tmp15_; PhotoFileFormat _tmp16_; gboolean _tmp17_; -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->priv->readers; -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->developer; -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_file_format_can_write_metadata (_tmp16_); -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp17_; -#line 25761 "Photo.c" +#line 25886 "Photo.c" } else { -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; -#line 25765 "Photo.c" +#line 25890 "Photo.c" } -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 25769 "Photo.c" +#line 25894 "Photo.c" PhotoBackingReaders* _tmp18_; PhotoFileReader* _tmp19_; PhotoFileReader* _tmp20_; -#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->priv->readers; -#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->developer; -#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _photo_file_adapter_ref0 (_tmp19_); -#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" export_reader = _tmp20_; -#line 3573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3592 "/home/jens/Source/shotwell/src/Photo.vala" is_master = FALSE; -#line 25785 "Photo.c" +#line 25910 "Photo.c" } else { PhotoBackingReaders* _tmp21_; PhotoFileReader* _tmp22_; PhotoFileFormat _tmp23_; gboolean _tmp24_; -#line 3574 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = self->priv->readers; -#line 3574 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_->master; -#line 3574 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3574 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = photo_file_format_can_write_metadata (_tmp23_); -#line 3574 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_) { -#line 25801 "Photo.c" +#line 25926 "Photo.c" PhotoBackingReaders* _tmp25_; PhotoFileReader* _tmp26_; PhotoFileReader* _tmp27_; -#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->priv->readers; -#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_->master; -#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _photo_file_adapter_ref0 (_tmp26_); -#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3594 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3594 "/home/jens/Source/shotwell/src/Photo.vala" export_reader = _tmp27_; -#line 25815 "Photo.c" +#line 25940 "Photo.c" } } } } - __finally386: + __finally398: { PhotoBackingReaders* _tmp28_; -#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = self->priv->readers; -#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 25827 "Photo.c" +#line 25952 "Photo.c" } -#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 25831 "Photo.c" +#line 25956 "Photo.c" gboolean _tmp29_ = FALSE; -#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp29_; -#line 25839 "Photo.c" +#line 25964 "Photo.c" } } -#line 3579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = export_reader; -#line 3579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp30_ == NULL) { -#line 3580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 3580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25852 "Photo.c" +#line 25977 "Photo.c" } -#line 3582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = export_reader; -#line 3582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = photo_file_format_get_properties (_tmp32_); -#line 3582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" format_properties = _tmp33_; -#line 3585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3604 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = format_properties; -#line 3585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3604 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = file; -#line 3585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3604 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = photo_file_format_properties_convert_file_extension (_tmp34_, _tmp35_); -#line 3585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3604 "/home/jens/Source/shotwell/src/Photo.vala" dest_file = _tmp36_; -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = export_reader; -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = dest_file; -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = g_file_get_path (_tmp39_); -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_; -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = photo_file_format_create_metadata_writer (_tmp38_, _tmp41_, &_inner_error_); -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp42_; -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp41_); -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" writer = _tmp43_; -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 25890 "Photo.c" +#line 26015 "Photo.c" gboolean _tmp44_ = FALSE; -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dest_file); -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (format_properties); -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp44_; -#line 25902 "Photo.c" +#line 26027 "Photo.c" } -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = _tmp45_; -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = writer; -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = _tmp48_; -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3591: Exporting full-sized copy of %s to %s", _tmp46_, _tmp49_); -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:3610: Exporting full-sized copy of %s to %s", _tmp46_, _tmp49_); +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp49_); -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp46_); -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = export_reader; -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = _tmp51_; -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = dest_file; -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" g_file_copy (_tmp52_, _tmp53_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp52_); -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 25934 "Photo.c" +#line 26059 "Photo.c" gboolean _tmp54_ = FALSE; -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dest_file); -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (format_properties); -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp54_; -#line 25948 "Photo.c" +#line 26073 "Photo.c" } -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = photo_has_alterations (self); -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp60_) { -#line 25954 "Photo.c" +#line 26079 "Photo.c" gboolean _tmp61_; -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = is_master; -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = _tmp61_; -#line 25960 "Photo.c" +#line 26085 "Photo.c" } else { -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = FALSE; -#line 25964 "Photo.c" +#line 26089 "Photo.c" } -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp59_) { -#line 25968 "Photo.c" +#line 26093 "Photo.c" gboolean _tmp62_; -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = photo_has_user_generated_metadata (self); -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = !_tmp62_; -#line 25974 "Photo.c" +#line 26099 "Photo.c" } else { -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = FALSE; -#line 25978 "Photo.c" +#line 26103 "Photo.c" } -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp58_) { -#line 25982 "Photo.c" +#line 26107 "Photo.c" gchar* _tmp63_; gchar* _tmp64_; -#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = _tmp63_; -#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = _tmp64_ == NULL; -#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp64_); -#line 25993 "Photo.c" +#line 26118 "Photo.c" } else { -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = FALSE; -#line 25997 "Photo.c" +#line 26122 "Photo.c" } -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp57_) { -#line 26001 "Photo.c" +#line 26126 "Photo.c" gchar* _tmp65_; gchar* _tmp66_; -#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = _tmp65_; -#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = _tmp66_ == NULL; -#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp66_); -#line 26012 "Photo.c" +#line 26137 "Photo.c" } else { -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = FALSE; -#line 26016 "Photo.c" +#line 26141 "Photo.c" } -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp56_) { -#line 26020 "Photo.c" +#line 26145 "Photo.c" gboolean _tmp67_; -#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = export_metadata; -#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _tmp67_; -#line 26026 "Photo.c" +#line 26151 "Photo.c" } else { -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = FALSE; -#line 26030 "Photo.c" +#line 26155 "Photo.c" } -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp55_) { -#line 3600 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3619 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 3600 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3619 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3600 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3619 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dest_file); -#line 3600 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3619 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (format_properties); -#line 3600 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3619 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3600 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3619 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 26046 "Photo.c" +#line 26171 "Photo.c" } -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = export_reader; -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = photo_file_reader_read_metadata (_tmp68_, &_inner_error_); -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp69_; -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 26056 "Photo.c" +#line 26181 "Photo.c" gboolean _tmp70_ = FALSE; -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dest_file); -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (format_properties); -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp70_; -#line 26070 "Photo.c" +#line 26195 "Photo.c" } -#line 3604 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3623 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = metadata; -#line 3604 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3623 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp71_ == NULL) { -#line 26076 "Photo.c" +#line 26201 "Photo.c" PhotoFileReader* _tmp72_; PhotoFileFormat _tmp73_; PhotoMetadata* _tmp74_; -#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = export_reader; -#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = photo_file_format_create_metadata (_tmp73_); -#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3624 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3624 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp74_; -#line 26090 "Photo.c" +#line 26215 "Photo.c" } -#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3626 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = writer; -#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3626 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3626 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = _tmp76_; -#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3607: Updating metadata of %s", _tmp77_); -#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3626 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:3626: Updating metadata of %s", _tmp77_); +#line 3626 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp77_); -#line 3609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3628 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp78_ != ((time_t) 0)) { -#line 26106 "Photo.c" +#line 26231 "Photo.c" PhotoMetadata* _tmp79_; time_t _tmp80_; MetadataDateTime* _tmp81_; MetadataDateTime* _tmp82_; -#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = metadata; -#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = metadata_date_time_new (_tmp80_); -#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = _tmp81_; -#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_exposure_date_time (_tmp79_, _tmp82_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (_tmp82_); -#line 26123 "Photo.c" +#line 26248 "Photo.c" } else { PhotoMetadata* _tmp83_; -#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = metadata; -#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_exposure_date_time (_tmp83_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 26130 "Photo.c" +#line 26255 "Photo.c" } -#line 3614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = export_metadata; -#line 3614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp84_) { -#line 26136 "Photo.c" +#line 26261 "Photo.c" PhotoMetadata* _tmp85_; gchar* _tmp86_; gchar* _tmp87_; @@ -26149,110 +26274,110 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole Orientation _tmp96_; Orientation _tmp97_; PhotoMetadata* _tmp99_; -#line 3616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = metadata; -#line 3616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = _tmp86_; -#line 3616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3635 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_title (_tmp85_, _tmp87_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3635 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp87_); -#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3636 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = metadata; -#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3636 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3636 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tmp89_; -#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3636 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_comment (_tmp88_, _tmp90_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3636 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp90_); -#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3637 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = metadata; -#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3637 "/home/jens/Source/shotwell/src/Photo.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp92_); -#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3637 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_pixel_dimensions (_tmp91_, &_tmp92_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = metadata; -#line 3619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = photo_get_orientation (self); -#line 3619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_orientation (_tmp93_, _tmp94_); -#line 3620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = metadata; -#line 3620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3639 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_software (_tmp95_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); -#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3641 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = photo_get_orientation (self); -#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3641 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = photo_get_original_orientation (self); -#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3641 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp96_ != _tmp97_) { -#line 26193 "Photo.c" +#line 26318 "Photo.c" PhotoMetadata* _tmp98_; -#line 3623 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3642 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = metadata; -#line 3623 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3642 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_remove_exif_thumbnail (_tmp98_); -#line 26199 "Photo.c" +#line 26324 "Photo.c" } -#line 3625 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3644 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = metadata; -#line 3625 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3644 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_user_metadata_for_export (self, _tmp99_); -#line 26205 "Photo.c" +#line 26330 "Photo.c" } else { PhotoMetadata* _tmp100_; -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = metadata; -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3648 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_clear (_tmp100_); -#line 26212 "Photo.c" +#line 26337 "Photo.c" } -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = writer; -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = metadata; -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp101_, _tmp102_, &_inner_error_); -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 26222 "Photo.c" +#line 26347 "Photo.c" gboolean _tmp103_ = FALSE; -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dest_file); -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (format_properties); -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp103_; -#line 26238 "Photo.c" +#line 26363 "Photo.c" } -#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3652 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3652 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3652 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3652 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dest_file); -#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3652 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (format_properties); -#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3652 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3652 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 26254 "Photo.c" +#line 26379 "Photo.c" } @@ -26262,59 +26387,59 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; gboolean _tmp3_; -#line 3639 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3658 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 3639 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3658 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, FALSE); -#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = scaling_is_unscaled (scaling); -#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = TRUE; -#line 26274 "Photo.c" +#line 26399 "Photo.c" } else { gboolean _tmp4_; -#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_has_alterations (self); -#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp4_; -#line 26281 "Photo.c" +#line 26406 "Photo.c" } -#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = TRUE; -#line 26287 "Photo.c" +#line 26412 "Photo.c" } else { gboolean _tmp5_; -#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_has_user_generated_metadata (self); -#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp5_; -#line 26294 "Photo.c" +#line 26419 "Photo.c" } -#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 26300 "Photo.c" +#line 26425 "Photo.c" } else { PhotoFileFormat _tmp6_; PhotoFileFormat _tmp7_; -#line 3641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = export_format; -#line 3641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_get_file_format (self); -#line 3641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp6_ != _tmp7_; -#line 26310 "Photo.c" +#line 26435 "Photo.c" } -#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 26316 "Photo.c" +#line 26441 "Photo.c" } @@ -26364,342 +26489,342 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality PhotoFileMetadataWriter* _tmp92_; PhotoMetadata* _tmp93_; GError * _inner_error_ = NULL; -#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3666 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3666 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (dest_file)); -#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3666 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (scaling != NULL); -#line 3649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = direct_copy_unmodified; -#line 3649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3668 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 26376 "Photo.c" +#line 26501 "Photo.c" GFile* _tmp1_; GFile* _tmp2_; GFile* _tmp3_; -#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = dest_file; -#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" g_file_copy (_tmp2_, _tmp3_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); -#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp2_); -#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26396 "Photo.c" +#line 26521 "Photo.c" } -#line 3652 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3671 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26400 "Photo.c" +#line 26525 "Photo.c" } -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = scaling_is_unscaled (scaling); -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { -#line 26406 "Photo.c" +#line 26531 "Photo.c" gboolean _tmp8_ = FALSE; gboolean _tmp9_; -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_has_alterations (self); -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp9_) { -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = TRUE; -#line 26415 "Photo.c" +#line 26540 "Photo.c" } else { gboolean _tmp10_; -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_only_metadata_changed (self); -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp10_; -#line 26422 "Photo.c" +#line 26547 "Photo.c" } -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp8_; -#line 26426 "Photo.c" +#line 26551 "Photo.c" } else { -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; -#line 26430 "Photo.c" +#line 26555 "Photo.c" } -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 26434 "Photo.c" +#line 26559 "Photo.c" PhotoFileFormat _tmp11_; PhotoFileFormat _tmp12_; -#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3679 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = export_format; -#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3679 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_get_file_format (self); -#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3679 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp11_ == _tmp12_; -#line 26443 "Photo.c" +#line 26568 "Photo.c" } else { -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = FALSE; -#line 26447 "Photo.c" +#line 26572 "Photo.c" } -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 26451 "Photo.c" +#line 26576 "Photo.c" PhotoFileFormat _tmp13_; -#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3679 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_get_file_format (self); -#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3679 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp13_ == PHOTO_FILE_FORMAT_JFIF; -#line 26457 "Photo.c" +#line 26582 "Photo.c" } else { -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = FALSE; -#line 26461 "Photo.c" +#line 26586 "Photo.c" } -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_) { -#line 26465 "Photo.c" +#line 26590 "Photo.c" gboolean _tmp14_ = FALSE; GFile* _tmp15_; gboolean _tmp16_; gboolean _tmp17_; -#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = dest_file; -#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = export_metadata; -#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_export_fullsized_backing (self, _tmp15_, _tmp16_, &_inner_error_); -#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp17_; -#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26484 "Photo.c" +#line 26609 "Photo.c" } -#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_) { -#line 3662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3681 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26490 "Photo.c" +#line 26615 "Photo.c" } } -#line 3668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3687 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource)); -#line 3668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3687 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp18_; -#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = metadata; -#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_ == NULL) { -#line 26501 "Photo.c" +#line 26626 "Photo.c" PhotoFileFormat _tmp20_; PhotoMetadata* _tmp21_; -#line 3670 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = export_format; -#line 3670 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_file_format_create_metadata (_tmp20_); -#line 3670 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3689 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3670 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3689 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp21_; -#line 26512 "Photo.c" +#line 26637 "Photo.c" } -#line 3672 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3691 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = export_format; -#line 3672 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3691 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo_file_format_can_write (_tmp22_); -#line 3672 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3691 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp23_) { -#line 26520 "Photo.c" +#line 26645 "Photo.c" PhotoFileFormat _tmp24_; -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = photo_file_format_get_system_default_format (); -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" export_format = _tmp24_; -#line 26526 "Photo.c" +#line 26651 "Photo.c" } -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = export_format; -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = dest_file; -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = g_file_get_path (_tmp26_); -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_; -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = photo_file_format_create_writer (_tmp25_, _tmp28_, &_inner_error_); -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_; -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp28_); -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" writer = _tmp30_; -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26552 "Photo.c" +#line 26677 "Photo.c" } -#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_; -#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = writer; -#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_; -#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = export_format; -#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3697 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), _tmp36_); -#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3677: Saving transformed version of %s to %s in file format" \ +#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:3696: Saving transformed version of %s to %s in file format" \ " %s", _tmp32_, _tmp35_, (_tmp37_ != NULL) ? _tmp37_->value_name : NULL); -#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp35_); -#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp32_); -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3703 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = photo_get_file_format (self); -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3703 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp39_ == PHOTO_FILE_FORMAT_JFIF) { -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3703 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = TRUE; -#line 26580 "Photo.c" +#line 26705 "Photo.c" } else { PhotoFileFormat _tmp40_; -#line 3685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3704 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = photo_get_file_format (self); -#line 3685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3704 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp40_ == PHOTO_FILE_FORMAT_RAW; -#line 26587 "Photo.c" +#line 26712 "Photo.c" } -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3703 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp38_) { -#line 26591 "Photo.c" +#line 26716 "Photo.c" GdkPixbuf* _tmp41_ = NULL; Scaling _tmp42_; GdkPixbuf* _tmp43_; GdkPixbuf* _tmp44_; -#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = *scaling; -#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = photo_get_pixbuf_with_options (self, &_tmp42_, PHOTO_EXCEPTION_ORIENTATION, BACKING_FETCH_MODE_SOURCE, &_inner_error_); -#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp43_; -#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26614 "Photo.c" +#line 26739 "Photo.c" } -#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp41_; -#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = NULL; -#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp44_; -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3703 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp41_); -#line 26626 "Photo.c" +#line 26751 "Photo.c" } else { GdkPixbuf* _tmp45_ = NULL; Scaling _tmp46_; GdkPixbuf* _tmp47_; GdkPixbuf* _tmp48_; -#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = *scaling; -#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = photo_get_pixbuf_with_options (self, &_tmp46_, PHOTO_EXCEPTION_NONE, BACKING_FETCH_MODE_SOURCE, &_inner_error_); -#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp47_; -#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26650 "Photo.c" +#line 26775 "Photo.c" } -#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp45_; -#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = NULL; -#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp48_; -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3703 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp45_); -#line 26662 "Photo.c" +#line 26787 "Photo.c" } -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = writer; -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = pixbuf; -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = quality; -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_writer_write (_tmp49_, _tmp50_, _tmp51_, &_inner_error_); -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26684 "Photo.c" +#line 26809 "Photo.c" } -#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3715 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = writer; -#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3715 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3715 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = _tmp53_; -#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3696: Setting EXIF for %s", _tmp54_); -#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3715 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:3715: Setting EXIF for %s", _tmp54_); +#line 3715 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp54_); -#line 3699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = export_metadata; -#line 3699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3718 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp55_) { -#line 26700 "Photo.c" +#line 26825 "Photo.c" PhotoMetadata* _tmp56_; gchar* _tmp57_; gchar* _tmp58_; @@ -26712,205 +26837,205 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality PhotoMetadata* _tmp70_; PhotoMetadata* _tmp71_; gboolean _tmp72_; -#line 3701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3720 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = metadata; -#line 3701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3720 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3720 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = _tmp57_; -#line 3701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3720 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_title (_tmp56_, _tmp58_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3720 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp58_); -#line 3702 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3721 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = metadata; -#line 3702 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3721 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3702 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3721 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _tmp60_; -#line 3702 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3721 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_comment (_tmp59_, _tmp61_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3702 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3721 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp61_); -#line 3703 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3722 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = metadata; -#line 3703 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3722 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_software (_tmp62_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); -#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3724 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3724 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp63_ != ((time_t) 0)) { -#line 26741 "Photo.c" +#line 26866 "Photo.c" PhotoMetadata* _tmp64_; time_t _tmp65_; MetadataDateTime* _tmp66_; MetadataDateTime* _tmp67_; -#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = metadata; -#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = metadata_date_time_new (_tmp65_); -#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = _tmp66_; -#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3725 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_exposure_date_time (_tmp64_, _tmp67_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3725 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (_tmp67_); -#line 26758 "Photo.c" +#line 26883 "Photo.c" } else { PhotoMetadata* _tmp68_; -#line 3708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = metadata; -#line 3708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3727 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_exposure_date_time (_tmp68_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 26765 "Photo.c" +#line 26890 "Photo.c" } -#line 3710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = metadata; -#line 3710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3729 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_remove_tag (_tmp69_, "Exif.Iop.RelatedImageWidth"); -#line 3711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = metadata; -#line 3711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3730 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_remove_tag (_tmp70_, "Exif.Iop.RelatedImageHeight"); -#line 3712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = metadata; -#line 3712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3731 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_remove_exif_thumbnail (_tmp71_); -#line 3714 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3733 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = photo_has_user_generated_metadata (self); -#line 3714 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3733 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp72_) { -#line 26783 "Photo.c" +#line 26908 "Photo.c" PhotoMetadata* _tmp73_; -#line 3715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = metadata; -#line 3715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_user_metadata_for_export (self, _tmp73_); -#line 26789 "Photo.c" +#line 26914 "Photo.c" } } else { PhotoMetadata* _tmp74_; -#line 3719 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3738 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = metadata; -#line 3719 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3738 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_clear (_tmp74_); -#line 26797 "Photo.c" +#line 26922 "Photo.c" } -#line 3726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = photo_get_file_format (self); -#line 3726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3745 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp76_ == PHOTO_FILE_FORMAT_JFIF) { -#line 3726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = TRUE; -#line 26805 "Photo.c" +#line 26930 "Photo.c" } else { PhotoFileFormat _tmp77_; -#line 3727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = photo_get_file_format (self); -#line 3727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = _tmp77_ == PHOTO_FILE_FORMAT_RAW; -#line 26812 "Photo.c" +#line 26937 "Photo.c" } -#line 3726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3745 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp75_) { -#line 26816 "Photo.c" +#line 26941 "Photo.c" PhotoMetadata* _tmp78_; Dimensions _tmp79_ = {0}; PhotoMetadata* _tmp80_; Orientation _tmp81_; -#line 3728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = metadata; -#line 3728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3747 "/home/jens/Source/shotwell/src/Photo.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ORIENTATION, &_tmp79_); -#line 3728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3747 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_pixel_dimensions (_tmp78_, &_tmp79_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = metadata; -#line 3729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = photo_get_orientation (self); -#line 3729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3748 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_orientation (_tmp80_, _tmp81_); -#line 26833 "Photo.c" +#line 26958 "Photo.c" } else { PhotoMetadata* _tmp82_; GdkPixbuf* _tmp83_; Dimensions _tmp84_ = {0}; PhotoMetadata* _tmp85_; -#line 3732 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3751 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = metadata; -#line 3732 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3751 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = pixbuf; -#line 3732 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3751 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_for_pixbuf (_tmp83_, &_tmp84_); -#line 3732 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3751 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_pixel_dimensions (_tmp82_, &_tmp84_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3733 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = metadata; -#line 3733 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_orientation (_tmp85_, ORIENTATION_TOP_LEFT); -#line 26851 "Photo.c" +#line 26976 "Photo.c" } -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = export_format; -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = dest_file; -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = g_file_get_path (_tmp88_); -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tmp89_; -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = photo_file_format_create_metadata_writer (_tmp87_, _tmp90_, &_inner_error_); -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = _tmp91_; -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp90_); -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = _tmp92_; -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26881 "Photo.c" +#line 27006 "Photo.c" } -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = metadata; -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp86_, _tmp93_, &_inner_error_); -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp86_); -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26901 "Photo.c" +#line 27026 "Photo.c" } -#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3666 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp86_); -#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3666 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3666 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3666 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 26911 "Photo.c" +#line 27036 "Photo.c" } @@ -26941,212 +27066,212 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi GFile* _tmp30_; GFile* _tmp31_; GError * _inner_error_ = NULL; -#line 3739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 26944 "Photo.c" +#line 27069 "Photo.c" { PhotoRow* _tmp0_; -#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 26951 "Photo.c" +#line 27076 "Photo.c" { PhotoFileFormat _tmp1_; GFile* _tmp2_; -#line 3742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3761 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_file_format (self); -#line 3742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3761 "/home/jens/Source/shotwell/src/Photo.vala" _vala_file_format = _tmp1_; -#line 3743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (backing); -#line 3743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp2_; -#line 26965 "Photo.c" +#line 27090 "Photo.c" } - __finally387: + __finally399: { PhotoRow* _tmp3_; -#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 26974 "Photo.c" +#line 27099 "Photo.c" } -#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (backing); -#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 26984 "Photo.c" +#line 27109 "Photo.c" } } -#line 3746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3765 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _vala_file_format; -#line 3746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3765 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_file_format_can_write (_tmp4_); -#line 3746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3765 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp5_) { -#line 26993 "Photo.c" +#line 27118 "Photo.c" PhotoFileFormat _tmp6_; -#line 3747 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3766 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_file_format_get_system_default_format (); -#line 3747 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3766 "/home/jens/Source/shotwell/src/Photo.vala" _vala_file_format = _tmp6_; -#line 26999 "Photo.c" +#line 27124 "Photo.c" } -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = g_file_get_basename (backing); -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" disassemble_filename (_tmp8_, &_tmp9_, &_tmp10_); -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" name = _tmp9_; -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" ext = _tmp10_; -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp8_); -#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = ext; -#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_ == NULL) { -#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; -#line 27023 "Photo.c" +#line 27148 "Photo.c" } else { PhotoFileFormat _tmp13_; PhotoFileFormatProperties* _tmp14_; PhotoFileFormatProperties* _tmp15_; const gchar* _tmp16_; gboolean _tmp17_; -#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _vala_file_format; -#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo_file_format_get_properties (_tmp13_); -#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_; -#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = ext; -#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_file_format_properties_is_recognized_extension (_tmp15_, _tmp16_); -#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = !_tmp17_; -#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (_tmp15_); -#line 27044 "Photo.c" +#line 27169 "Photo.c" } -#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 27048 "Photo.c" +#line 27173 "Photo.c" PhotoFileFormat _tmp18_; PhotoFileFormatProperties* _tmp19_; PhotoFileFormatProperties* _tmp20_; gchar* _tmp21_; -#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _vala_file_format; -#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = photo_file_format_get_properties (_tmp18_); -#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_file_format_properties_get_default_extension (_tmp20_); -#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3772 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3772 "/home/jens/Source/shotwell/src/Photo.vala" ext = _tmp21_; -#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3772 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (_tmp20_); -#line 27067 "Photo.c" +#line 27192 "Photo.c" } -#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3774 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = name; -#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3774 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = ext; -#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3774 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = g_strdup_printf ("%s_%s.%s", _tmp22_, _ ("modified"), _tmp23_); -#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3774 "/home/jens/Source/shotwell/src/Photo.vala" editable_basename = _tmp24_; -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = g_file_get_parent (backing); -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_; -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = generate_unique_file (_tmp27_, editable_basename, &_tmp28_, &_inner_error_); -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" collision = _tmp28_; -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_; -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp27_); -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp30_; -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (editable_basename); -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (backing); -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 27105 "Photo.c" +#line 27230 "Photo.c" } -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp25_; -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = NULL; -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp31_; -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp25_); -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (editable_basename); -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (backing); -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" if (file_format) { -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" *file_format = _vala_file_format; -#line 27127 "Photo.c" +#line 27252 "Photo.c" } -#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27131 "Photo.c" +#line 27256 "Photo.c" } static void _g_object_unref0_ (gpointer var) { -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 27138 "Photo.c" +#line 27263 "Photo.c" } static void _g_list_free__g_object_unref0_ (GList* self) { -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" g_list_free (self); -#line 27147 "Photo.c" +#line 27272 "Photo.c" } @@ -27184,266 +27309,266 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G GPid _tmp35_ = 0; gboolean _tmp36_; GError * _inner_error_ = NULL; -#line 3761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file_format; -#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) { -#line 27191 "Photo.c" +#line 27316 "Photo.c" ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; gchar* _tmp4_; -#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = config_facade_get_instance (); -#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp4_; -#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 27207 "Photo.c" +#line 27332 "Photo.c" } else { ConfigFacade* _tmp5_; ConfigFacade* _tmp6_; gchar* _tmp7_; -#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = config_facade_get_instance (); -#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp7_; -#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp6_); -#line 27224 "Photo.c" +#line 27349 "Photo.c" } -#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_strdup (_tmp0_); -#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" commandline = _tmp8_; -#line 3765 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = commandline; -#line 3765 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = is_string_empty (_tmp9_); -#line 3765 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_) { -#line 3766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3785 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 3766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3785 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (commandline); -#line 3766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3785 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3785 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27244 "Photo.c" +#line 27369 "Photo.c" } { GAppInfo* _tmp11_ = NULL; const gchar* _tmp12_; GAppInfo* _tmp13_; GAppInfo* _tmp14_; -#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3789 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = commandline; -#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3789 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = g_app_info_create_from_commandline (_tmp12_, "", G_APP_INFO_CREATE_NONE, &_inner_error_); -#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3789 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp13_; -#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27259 "Photo.c" - goto __catch388_g_error; +#line 27384 "Photo.c" + goto __catch400_g_error; } -#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3789 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp11_; -#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3789 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = NULL; -#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3789 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3789 "/home/jens/Source/shotwell/src/Photo.vala" app = _tmp14_; -#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp11_); -#line 27272 "Photo.c" +#line 27397 "Photo.c" } - goto __finally388; - __catch388_g_error: + goto __finally400; + __catch400_g_error: { GError* er = NULL; -#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" er = _inner_error_; -#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 3773 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3792 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3773 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3792 "/home/jens/Source/shotwell/src/Photo.vala" app = NULL; -#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (er); -#line 27288 "Photo.c" +#line 27413 "Photo.c" } - __finally388: -#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" + __finally400: +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27293 "Photo.c" +#line 27418 "Photo.c" gboolean _tmp15_ = FALSE; -#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (commandline); -#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp15_; -#line 27305 "Photo.c" +#line 27430 "Photo.c" } -#line 3776 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3795 "/home/jens/Source/shotwell/src/Photo.vala" files = NULL; -#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3796 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = file; -#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3796 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _g_object_ref0 (_tmp16_); -#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3796 "/home/jens/Source/shotwell/src/Photo.vala" files = g_list_insert (files, _tmp17_, -1); -#line 3779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3798 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = app; -#line 3779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3798 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_ != NULL) { -#line 27319 "Photo.c" +#line 27444 "Photo.c" gboolean _tmp19_ = FALSE; GAppInfo* _tmp20_; GList* _tmp21_; gboolean _tmp22_; -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = app; -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = files; -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = g_app_info_launch (_tmp20_, _tmp21_, NULL, &_inner_error_); -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp22_; -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27334 "Photo.c" +#line 27459 "Photo.c" gboolean _tmp23_ = FALSE; -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" __g_list_free__g_object_unref0_0 (files); -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (commandline); -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp23_; -#line 27348 "Photo.c" +#line 27473 "Photo.c" } -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp19_; -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" __g_list_free__g_object_unref0_0 (files); -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (commandline); -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27362 "Photo.c" +#line 27487 "Photo.c" } -#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3801 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = g_new0 (gchar*, 2 + 1); -#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3801 "/home/jens/Source/shotwell/src/Photo.vala" argv = _tmp24_; -#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3801 "/home/jens/Source/shotwell/src/Photo.vala" argv_length1 = 2; -#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3801 "/home/jens/Source/shotwell/src/Photo.vala" _argv_size_ = argv_length1; -#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = argv; -#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25__length1 = argv_length1; -#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = commandline; -#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = g_strdup (_tmp26_); -#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3802 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp25_[0]); -#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_[0] = _tmp27_; -#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp25_[0]; -#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = argv; -#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29__length1 = argv_length1; -#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = file; -#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = g_file_get_path (_tmp30_); -#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp29_[1]); -#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_[1] = _tmp31_; -#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp29_[1]; -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = argv; -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34__length1 = argv_length1; -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = g_spawn_async ("/", _tmp34_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp35_, &_inner_error_); -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" child_pid = _tmp35_; -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp36_; -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27412 "Photo.c" +#line 27537 "Photo.c" gboolean _tmp37_ = FALSE; -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" __g_list_free__g_object_unref0_0 (files); -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (commandline); -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp37_; -#line 27428 "Photo.c" +#line 27553 "Photo.c" } -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp33_; -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" __g_list_free__g_object_unref0_0 (files); -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (commandline); -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27444 "Photo.c" +#line 27569 "Photo.c" } @@ -27452,25 +27577,25 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error) { GFile* _tmp1_; PhotoFileFormat _tmp2_; GError * _inner_error_ = NULL; -#line 3798 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3817 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_get_master_file_format (self); -#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" photo_launch_editor (_tmp1_, _tmp2_, &_inner_error_); -#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27471 "Photo.c" +#line 27596 "Photo.c" } } @@ -27489,248 +27614,248 @@ void photo_open_with_external_editor (Photo* self, GError** error) { GFile* _tmp47_; PhotoFileFormat _tmp48_; GError * _inner_error_ = NULL; -#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3822 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3804 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3823 "/home/jens/Source/shotwell/src/Photo.vala" current_editable_file = NULL; -#line 3805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" create_editable_file = NULL; -#line 27496 "Photo.c" +#line 27621 "Photo.c" { PhotoBackingReaders* _tmp0_; -#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 27503 "Photo.c" +#line 27628 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; GFile* _tmp6_; -#line 3808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 3808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 3808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 27514 "Photo.c" +#line 27639 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; GFile* _tmp5_; -#line 3809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 3809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->editable; -#line 3809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" current_editable_file = _tmp5_; -#line 27528 "Photo.c" +#line 27653 "Photo.c" } -#line 3811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = current_editable_file; -#line 3811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3830 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ == NULL) { -#line 27534 "Photo.c" +#line 27659 "Photo.c" GFile* _tmp7_ = NULL; PhotoFileFormat _tmp8_ = 0; GFile* _tmp9_; GFile* _tmp10_; -#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3831 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_generate_new_editable_file (self, &_tmp8_, &_inner_error_); -#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3831 "/home/jens/Source/shotwell/src/Photo.vala" editable_file_format = _tmp8_; -#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3831 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp9_; -#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3831 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27547 "Photo.c" - goto __finally389; +#line 27672 "Photo.c" + goto __finally401; } -#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3831 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp7_; -#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3831 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = NULL; -#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3831 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3831 "/home/jens/Source/shotwell/src/Photo.vala" create_editable_file = _tmp10_; -#line 3811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3830 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp7_); -#line 27560 "Photo.c" +#line 27685 "Photo.c" } else { PhotoBackingReaders* _tmp11_; PhotoFileReader* _tmp12_; PhotoFileFormat _tmp13_; -#line 3814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->priv->readers; -#line 3814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->editable; -#line 3814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3833 "/home/jens/Source/shotwell/src/Photo.vala" editable_file_format = _tmp13_; -#line 27573 "Photo.c" +#line 27698 "Photo.c" } } - __finally389: + __finally401: { PhotoBackingReaders* _tmp14_; -#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->priv->readers; -#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 27583 "Photo.c" +#line 27708 "Photo.c" } -#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27595 "Photo.c" +#line 27720 "Photo.c" } } -#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = create_editable_file; -#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3838 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_ == NULL) { -#line 27602 "Photo.c" +#line 27727 "Photo.c" GFile* _tmp18_; -#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = current_editable_file; -#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp18_ != NULL; -#line 27608 "Photo.c" +#line 27733 "Photo.c" } else { -#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = FALSE; -#line 27612 "Photo.c" +#line 27737 "Photo.c" } -#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3838 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_) { -#line 27616 "Photo.c" +#line 27741 "Photo.c" gboolean _tmp19_ = FALSE; GFile* _tmp20_; gboolean _tmp21_; -#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3839 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = current_editable_file; -#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3839 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = g_file_query_exists (_tmp20_, NULL); -#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3839 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp21_) { -#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3839 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = TRUE; -#line 27628 "Photo.c" +#line 27753 "Photo.c" } else { gboolean _tmp22_; -#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3839 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = photo_has_transformations (self); -#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3839 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp22_; -#line 27635 "Photo.c" +#line 27760 "Photo.c" } -#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3839 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp19_; -#line 27639 "Photo.c" +#line 27764 "Photo.c" } else { -#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = FALSE; -#line 27643 "Photo.c" +#line 27768 "Photo.c" } -#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3838 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 27647 "Photo.c" +#line 27772 "Photo.c" GFile* _tmp23_; GFile* _tmp24_; -#line 3821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3840 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = current_editable_file; -#line 3821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3840 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _g_object_ref0 (_tmp23_); -#line 3821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3840 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3840 "/home/jens/Source/shotwell/src/Photo.vala" create_editable_file = _tmp24_; -#line 27658 "Photo.c" +#line 27783 "Photo.c" } -#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3843 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = create_editable_file; -#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3843 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp26_ != NULL) { -#line 27664 "Photo.c" +#line 27789 "Photo.c" PhotoFileFormat _tmp27_; gboolean _tmp28_; -#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3843 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = editable_file_format; -#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3843 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = photo_file_format_can_write (_tmp27_); -#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3843 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp28_; -#line 27673 "Photo.c" +#line 27798 "Photo.c" } else { -#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3843 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = FALSE; -#line 27677 "Photo.c" +#line 27802 "Photo.c" } -#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3843 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp25_) { -#line 27681 "Photo.c" +#line 27806 "Photo.c" PhotoFileFormat _tmp40_; GFile* _tmp41_; GFile* _tmp42_; GFile* _tmp43_; -#line 3825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" photo_halt_monitoring_editable (self); -#line 27688 "Photo.c" +#line 27813 "Photo.c" { GFile* _tmp29_; Scaling _tmp30_ = {0}; PhotoFileFormat _tmp31_; -#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = create_editable_file; -#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3847 "/home/jens/Source/shotwell/src/Photo.vala" scaling_for_original (&_tmp30_); -#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = editable_file_format; -#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3847 "/home/jens/Source/shotwell/src/Photo.vala" photo_export (self, _tmp29_, &_tmp30_, JPEG_QUALITY_MAXIMUM, _tmp31_, FALSE, TRUE, &_inner_error_); -#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3847 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27703 "Photo.c" - goto __catch390_g_error; +#line 27828 "Photo.c" + goto __catch402_g_error; } } - goto __finally390; - __catch390_g_error: + goto __finally402; + __catch402_g_error: { GError* err = NULL; GError* _tmp38_; GError* _tmp39_; -#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 27717 "Photo.c" +#line 27842 "Photo.c" { GFile* _tmp32_; -#line 3833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3852 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = create_editable_file; -#line 3833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3852 "/home/jens/Source/shotwell/src/Photo.vala" g_file_delete (_tmp32_, NULL, &_inner_error_); -#line 3833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3852 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27726 "Photo.c" - goto __catch391_g_error; +#line 27851 "Photo.c" + goto __catch403_g_error; } } - goto __finally391; - __catch391_g_error: + goto __finally403; + __catch403_g_error: { GError* delete_err = NULL; GFile* _tmp33_; @@ -27738,169 +27863,169 @@ void photo_open_with_external_editor (Photo* self, GError** error) { gchar* _tmp35_; GError* _tmp36_; const gchar* _tmp37_; -#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" delete_err = _inner_error_; -#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = create_editable_file; -#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = g_file_get_path (_tmp33_); -#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_; -#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = delete_err; -#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_->message; -#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:3836: Unable to delete editable file %s after export error:" \ +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:3855: Unable to delete editable file %s after export error:" \ " %s", _tmp35_, _tmp37_); -#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp35_); -#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (delete_err); -#line 27759 "Photo.c" +#line 27884 "Photo.c" } - __finally391: -#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" + __finally403: +#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27778 "Photo.c" +#line 27903 "Photo.c" } -#line 3840 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3859 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = err; -#line 3840 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3859 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _g_error_copy0 (_tmp38_); -#line 3840 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3859 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = _tmp39_; -#line 3840 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3859 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 27788 "Photo.c" - goto __finally390; +#line 27913 "Photo.c" + goto __finally402; } - __finally390: -#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" + __finally402: +#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27802 "Photo.c" +#line 27927 "Photo.c" } -#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = editable_file_format; -#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = create_editable_file; -#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3863 "/home/jens/Source/shotwell/src/Photo.vala" photo_attach_editable (self, _tmp40_, _tmp41_, &_inner_error_); -#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3863 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3863 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3863 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3863 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3863 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27820 "Photo.c" +#line 27945 "Photo.c" } -#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3865 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = create_editable_file; -#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3865 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _g_object_ref0 (_tmp42_); -#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3865 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3865 "/home/jens/Source/shotwell/src/Photo.vala" current_editable_file = _tmp43_; -#line 27830 "Photo.c" +#line 27955 "Photo.c" } -#line 3849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = current_editable_file; -#line 3849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp44_ != NULL, "current_editable_file != null"); -#line 3852 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = self->priv->editable_monitor; -#line 3852 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3871 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp45_ == NULL) { -#line 27840 "Photo.c" +#line 27965 "Photo.c" GFile* _tmp46_; -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3872 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = current_editable_file; -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3872 "/home/jens/Source/shotwell/src/Photo.vala" photo_start_monitoring_editable (self, _tmp46_, &_inner_error_); -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3872 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3872 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3872 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3872 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3872 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27856 "Photo.c" +#line 27981 "Photo.c" } } -#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3874 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = current_editable_file; -#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3874 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = photo_get_file_format (self); -#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3874 "/home/jens/Source/shotwell/src/Photo.vala" photo_launch_editor (_tmp47_, _tmp48_, &_inner_error_); -#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3874 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3874 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3874 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3874 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3874 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27875 "Photo.c" +#line 28000 "Photo.c" } -#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3822 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3822 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 27881 "Photo.c" +#line 28006 "Photo.c" } void photo_revert_to_master (Photo* self, gboolean notify) { gboolean _tmp0_; -#line 3858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3877 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3878 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = notify; -#line 3859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3878 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, TRUE, TRUE, _tmp0_); -#line 27893 "Photo.c" +#line 28018 "Photo.c" } static void _photo_on_editable_file_changed_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) { -#line 3869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3888 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_editable_file_changed ((Photo*) self, file, other_file, event_type); -#line 27900 "Photo.c" +#line 28025 "Photo.c" } @@ -27912,45 +28037,45 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError** GFileMonitor* _tmp4_; GFileMonitor* _tmp5_; GError * _inner_error_ = NULL; -#line 3862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3881 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3881 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); -#line 3863 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3882 "/home/jens/Source/shotwell/src/Photo.vala" photo_halt_monitoring_editable (self); -#line 3866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3885 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file; -#line 3866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3885 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_blacklist_file (_tmp0_, "Photo.start_monitoring_editable"); -#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = file; -#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = g_file_monitor (_tmp2_, G_FILE_MONITOR_NONE, NULL, &_inner_error_); -#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp3_; -#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3887 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3887 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3887 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27934 "Photo.c" +#line 28059 "Photo.c" } -#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp1_; -#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3887 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->editable_monitor); -#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3887 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->editable_monitor = _tmp4_; -#line 3869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->editable_monitor; -#line 3869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3888 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_connect_object (_tmp5_, "changed", (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self, 0); -#line 3862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3881 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 27950 "Photo.c" +#line 28075 "Photo.c" } @@ -27962,49 +28087,49 @@ static void photo_halt_monitoring_editable (Photo* self) { GFileMonitor* _tmp4_; guint _tmp5_; GFileMonitor* _tmp6_; -#line 3872 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3891 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->editable_monitor; -#line 3873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ == NULL) { -#line 3874 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3893 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27970 "Photo.c" +#line 28095 "Photo.c" } -#line 3877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_editable_file (self); -#line 3877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3896 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp1_; -#line 3878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3897 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = file; -#line 3878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3897 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 27980 "Photo.c" +#line 28105 "Photo.c" GFile* _tmp3_; -#line 3879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3898 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; -#line 3879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3898 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_unblacklist_file (_tmp3_); -#line 27986 "Photo.c" +#line 28111 "Photo.c" } -#line 3881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3900 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->editable_monitor; -#line 3881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3900 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_parse_name ("changed", g_file_monitor_get_type (), &_tmp5_, NULL, FALSE); -#line 3881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3900 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self); -#line 3882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3901 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->editable_monitor; -#line 3882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3901 "/home/jens/Source/shotwell/src/Photo.vala" g_file_monitor_cancel (_tmp6_); -#line 3883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3902 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->editable_monitor); -#line 3883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3902 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->editable_monitor = NULL; -#line 3872 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3891 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 28004 "Photo.c" +#line 28129 "Photo.c" } @@ -28016,174 +28141,174 @@ static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFi PhotoFileReader* _tmp4_; PhotoFileReader* _tmp5_; GError * _inner_error_ = NULL; -#line 3886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); -#line 3891 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3910 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file_format; -#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file; -#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = g_file_get_path (_tmp1_); -#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_file_format_create_reader (_tmp0_, _tmp3_); -#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" photo_update_editable (self, FALSE, _tmp5_, &_inner_error_); -#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp5_); -#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp3_); -#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28046 "Photo.c" +#line 28171 "Photo.c" } } static void photo_update_editable_attributes (Photo* self, GError** error) { GError * _inner_error_ = NULL; -#line 3895 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3914 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3915 "/home/jens/Source/shotwell/src/Photo.vala" photo_update_editable (self, TRUE, NULL, &_inner_error_); -#line 3896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3915 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3915 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3915 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28063 "Photo.c" +#line 28188 "Photo.c" } } void photo_reimport_editable (Photo* self, GError** error) { GError * _inner_error_ = NULL; -#line 3899 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3918 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3919 "/home/jens/Source/shotwell/src/Photo.vala" photo_update_editable (self, FALSE, NULL, &_inner_error_); -#line 3900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3919 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3919 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3919 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28080 "Photo.c" +#line 28205 "Photo.c" } } -static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value) { -#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value) { +#line 4026 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4026 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4026 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28092 "Photo.c" +#line 28217 "Photo.c" } -#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4026 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4026 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28098 "Photo.c" +#line 28223 "Photo.c" } -static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value) { -#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value) { +#line 4027 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4027 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4027 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28109 "Photo.c" +#line 28234 "Photo.c" } -#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4027 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4027 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28115 "Photo.c" +#line 28240 "Photo.c" } -static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value) { -#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add109 (gchar** * array, int* length, int* size, gchar* value) { +#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28126 "Photo.c" +#line 28251 "Photo.c" } -#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28132 "Photo.c" +#line 28257 "Photo.c" } -static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value) { -#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add110 (gchar** * array, int* length, int* size, gchar* value) { +#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28143 "Photo.c" +#line 28268 "Photo.c" } -#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28149 "Photo.c" +#line 28274 "Photo.c" } -static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value) { -#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add111 (gchar** * array, int* length, int* size, gchar* value) { +#line 4035 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4035 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4035 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28160 "Photo.c" +#line 28285 "Photo.c" } -#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4035 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4035 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28166 "Photo.c" +#line 28291 "Photo.c" } -static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value) { -#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" +static void _vala_array_add112 (gchar** * array, int* length, int* size, gchar* value) { +#line 4038 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4038 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4038 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28177 "Photo.c" +#line 28302 "Photo.c" } -#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4038 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4038 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28183 "Photo.c" +#line 28308 "Photo.c" } @@ -28226,168 +28351,168 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF gchar** _tmp131_; gint _tmp131__length1; GError * _inner_error_ = NULL; -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_reader == NULL) || IS_PHOTO_FILE_READER (new_reader)); -#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = only_attributes; -#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 28234 "Photo.c" +#line 28359 "Photo.c" PhotoFileReader* _tmp3_; -#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = new_reader; -#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp3_ == NULL; -#line 28240 "Photo.c" +#line 28365 "Photo.c" } else { -#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 28244 "Photo.c" +#line 28369 "Photo.c" } -#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 28250 "Photo.c" +#line 28375 "Photo.c" } else { gboolean _tmp4_; -#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = only_attributes; -#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = !_tmp4_; -#line 28257 "Photo.c" +#line 28382 "Photo.c" } -#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp0_, "(only_attributes && new_reader == null) || (!only_attributes)"); -#line 3909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_get_editable_reader (self); -#line 3909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3928 "/home/jens/Source/shotwell/src/Photo.vala" old_reader = _tmp5_; -#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = new_reader; -#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp7_; -#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ == NULL) { -#line 28271 "Photo.c" +#line 28396 "Photo.c" PhotoFileReader* _tmp8_; -#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = old_reader; -#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp8_; -#line 28277 "Photo.c" +#line 28402 "Photo.c" } -#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _photo_file_adapter_ref0 (_tmp6_); -#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" reader = _tmp9_; -#line 3912 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = reader; -#line 3912 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_ == NULL) { -#line 3913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, FALSE, TRUE, TRUE); -#line 3915 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3915 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3915 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28295 "Photo.c" +#line 28420 "Photo.c" } -#line 3918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3937 "/home/jens/Source/shotwell/src/Photo.vala" timestamp_changed = FALSE; -#line 3919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" filesize_changed = FALSE; -#line 3920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3939 "/home/jens/Source/shotwell/src/Photo.vala" is_new_editable = FALSE; -#line 3922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3941 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_editable_id (self, &_tmp11_); -#line 3922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3941 "/home/jens/Source/shotwell/src/Photo.vala" editable_id = _tmp11_; -#line 3923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3942 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = reader; -#line 3923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3942 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3942 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp13_; -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = file; -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo_query_backing_photo_row (self, _tmp14_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp15_, &_inner_error_); -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp15_; -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp16_; -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28337 "Photo.c" +#line 28462 "Photo.c" } -#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = backing_photo_id_is_invalid (&editable_id); -#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3949 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_) { -#line 28343 "Photo.c" +#line 28468 "Photo.c" BackingPhotoRow* _tmp18_; -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3951 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = backing; -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3951 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_ != NULL) { -#line 28349 "Photo.c" +#line 28474 "Photo.c" BackingPhotoTable* _tmp19_; BackingPhotoTable* _tmp20_; BackingPhotoRow* _tmp21_; -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = backing_photo_table_get_instance (); -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = backing; -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_add (_tmp20_, _tmp21_, &_inner_error_); -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp20_); -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28379 "Photo.c" +#line 28504 "Photo.c" } { PhotoRow* _tmp22_; -#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = self->row; -#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28387 "Photo.c" +#line 28512 "Photo.c" { PhotoTable* _tmp23_; PhotoTable* _tmp24_; @@ -28400,91 +28525,91 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF BackingPhotoRow* _tmp31_; BackingPhotoRow* _tmp32_; Orientation _tmp33_; -#line 3935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3954 "/home/jens/Source/shotwell/src/Photo.vala" timestamp_changed = TRUE; -#line 3936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3955 "/home/jens/Source/shotwell/src/Photo.vala" filesize_changed = TRUE; -#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo_table_get_instance (); -#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_; -#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->row; -#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = backing; -#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_->id; -#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3957 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_attach_editable (_tmp24_, _tmp25_, &_tmp27_, &_inner_error_); -#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3957 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp24_); -#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3957 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 28420 "Photo.c" - goto __finally392; +#line 28545 "Photo.c" + goto __finally404; } -#line 3939 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = backing; -#line 3939 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _backing_photo_row_ref0 (_tmp28_); -#line 3939 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); -#line 3939 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->editable = _tmp29_; -#line 3940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3959 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = self->priv->editable; -#line 3940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3959 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _backing_photo_row_ref0 (_tmp30_); -#line 3940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3959 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); -#line 3940 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3959 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = _tmp31_; -#line 3941 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3960 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = self->backing_photo_row; -#line 3941 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3960 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_->original_orientation; -#line 3941 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3960 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp33_); -#line 28445 "Photo.c" +#line 28570 "Photo.c" } - __finally392: + __finally404: { PhotoRow* _tmp34_; -#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = self->row; -#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28454 "Photo.c" +#line 28579 "Photo.c" } -#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28472 "Photo.c" +#line 28597 "Photo.c" } } } -#line 3944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" is_new_editable = TRUE; -#line 28478 "Photo.c" +#line 28603 "Photo.c" } -#line 3947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = only_attributes; -#line 3947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp35_) { -#line 28484 "Photo.c" +#line 28609 "Photo.c" gboolean _tmp36_; GFileInfo* info = NULL; GTimeVal timestamp = {0}; @@ -28497,155 +28622,155 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF glong _tmp51_; GFileInfo* _tmp52_; gint64 _tmp53_; -#line 3949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = backing_photo_id_is_valid (&editable_id); -#line 3949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3968 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp36_, "editable_id.is_valid()"); -#line 28501 "Photo.c" +#line 28626 "Photo.c" { GFileInfo* _tmp37_ = NULL; GFile* _tmp38_; GFileInfo* _tmp39_; GFileInfo* _tmp40_; -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = file; -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = g_file_query_filesystem_info (_tmp38_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, NULL, &_inner_error_); -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp39_; -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 28515 "Photo.c" - goto __catch393_g_error; +#line 28640 "Photo.c" + goto __catch405_g_error; } -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = _tmp37_; -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = NULL; -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" info = _tmp40_; -#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3971 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp37_); -#line 28528 "Photo.c" +#line 28653 "Photo.c" } - goto __finally393; - __catch393_g_error: + goto __finally405; + __catch405_g_error: { GError* err = NULL; gchar* _tmp41_; gchar* _tmp42_; GError* _tmp43_; const gchar* _tmp44_; -#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3971 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3971 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 3955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 3955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_; -#line 3955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = err; -#line 3955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp43_->message; -#line 3955 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:3955: Unable to read editable filesystem info for %s: %s", _tmp42_, _tmp44_); -#line 3955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:3974: Unable to read editable filesystem info for %s: %s", _tmp42_, _tmp44_); +#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp42_); -#line 3956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3975 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, FALSE, TRUE, TRUE); -#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3977 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3977 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3977 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3977 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3977 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3977 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3977 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3977 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28572 "Photo.c" +#line 28697 "Photo.c" } - __finally393: -#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" + __finally405: +#line 3971 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3971 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3971 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3971 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3971 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3971 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3971 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3971 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3971 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28593 "Photo.c" +#line 28718 "Photo.c" } -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = info; -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" g_file_info_get_modification_time (_tmp45_, &_tmp46_); -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" timestamp = _tmp46_; -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = backing_photo_table_get_instance (); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_; -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = editable_id; -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = timestamp; -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = _tmp50_.tv_sec; -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = info; -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = g_file_info_get_size (_tmp52_); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_update_attributes (_tmp48_, &_tmp49_, (time_t) _tmp51_, _tmp53_, &_inner_error_); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp48_); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28637 "Photo.c" +#line 28762 "Photo.c" } { PhotoRow* _tmp54_; -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = self->row; -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28645 "Photo.c" +#line 28770 "Photo.c" { BackingPhotoRow* _tmp55_; time_t _tmp56_; @@ -28661,145 +28786,145 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF BackingPhotoRow* _tmp66_; GFileInfo* _tmp67_; gint64 _tmp68_; -#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = self->priv->editable; -#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = _tmp55_->timestamp; -#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = timestamp; -#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = _tmp57_.tv_sec; -#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" timestamp_changed = _tmp56_ != ((time_t) _tmp58_); -#line 3967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = self->priv->editable; -#line 3967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = _tmp59_->filesize; -#line 3967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = info; -#line 3967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = g_file_info_get_size (_tmp61_); -#line 3967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" filesize_changed = _tmp60_ != _tmp62_; -#line 3969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = self->priv->editable; -#line 3969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = timestamp; -#line 3969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = _tmp64_.tv_sec; -#line 3969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_->timestamp = (time_t) _tmp65_; -#line 3970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3989 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = self->priv->editable; -#line 3970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3989 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = info; -#line 3970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3989 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = g_file_info_get_size (_tmp67_); -#line 3970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3989 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_->filesize = _tmp68_; -#line 28697 "Photo.c" +#line 28822 "Photo.c" } - __finally394: + __finally406: { PhotoRow* _tmp69_; -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = self->row; -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28706 "Photo.c" +#line 28831 "Photo.c" } -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28726 "Photo.c" +#line 28851 "Photo.c" } } -#line 3947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 28731 "Photo.c" +#line 28856 "Photo.c" } else { gboolean _tmp70_ = FALSE; gboolean _tmp71_; -#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = backing_photo_id_is_valid (&editable_id); -#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp71_) { -#line 28739 "Photo.c" +#line 28864 "Photo.c" gboolean _tmp72_; -#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = is_new_editable; -#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = !_tmp72_; -#line 28745 "Photo.c" +#line 28870 "Photo.c" } else { -#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = FALSE; -#line 28749 "Photo.c" +#line 28874 "Photo.c" } -#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp70_) { -#line 28753 "Photo.c" +#line 28878 "Photo.c" BackingPhotoRow* _tmp73_; BackingPhotoID _tmp74_; BackingPhotoTable* _tmp75_; BackingPhotoTable* _tmp76_; BackingPhotoRow* _tmp77_; -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = backing; -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = editable_id; -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_->id = _tmp74_; -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = backing_photo_table_get_instance (); -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = _tmp75_; -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = backing; -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_update (_tmp76_, _tmp77_, &_inner_error_); -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp76_); -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28791 "Photo.c" +#line 28916 "Photo.c" } { PhotoRow* _tmp78_; -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = self->row; -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28799 "Photo.c" +#line 28924 "Photo.c" { BackingPhotoRow* _tmp79_; time_t _tmp80_; @@ -28815,232 +28940,232 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF BackingPhotoRow* _tmp90_; BackingPhotoRow* _tmp91_; Orientation _tmp92_; -#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = self->priv->editable; -#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = _tmp79_->timestamp; -#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = backing; -#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = _tmp81_->timestamp; -#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" timestamp_changed = _tmp80_ != _tmp82_; -#line 3983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = self->priv->editable; -#line 3983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = _tmp83_->filesize; -#line 3983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = backing; -#line 3983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = _tmp85_->filesize; -#line 3983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" filesize_changed = _tmp84_ != _tmp86_; -#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4004 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = backing; -#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4004 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = _backing_photo_row_ref0 (_tmp87_); -#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4004 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); -#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4004 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->editable = _tmp88_; -#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = self->priv->editable; -#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _backing_photo_row_ref0 (_tmp89_); -#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); -#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = _tmp90_; -#line 3987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = self->backing_photo_row; -#line 3987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = _tmp91_->original_orientation; -#line 3987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp92_); -#line 28857 "Photo.c" +#line 28982 "Photo.c" } - __finally395: + __finally407: { PhotoRow* _tmp93_; -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = self->row; -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28866 "Photo.c" +#line 28991 "Photo.c" } -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28884 "Photo.c" +#line 29009 "Photo.c" } } } } -#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4012 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = new_reader; -#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4012 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp94_ != NULL) { -#line 28893 "Photo.c" +#line 29018 "Photo.c" { PhotoBackingReaders* _tmp95_; -#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = self->priv->readers; -#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 28900 "Photo.c" +#line 29025 "Photo.c" { PhotoBackingReaders* _tmp96_; PhotoFileReader* _tmp97_; PhotoFileReader* _tmp98_; -#line 3995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = self->priv->readers; -#line 3995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = new_reader; -#line 3995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = _photo_file_adapter_ref0 (_tmp97_); -#line 3995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp96_->editable); -#line 3995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_->editable = _tmp98_; -#line 28915 "Photo.c" +#line 29040 "Photo.c" } - __finally396: + __finally408: { PhotoBackingReaders* _tmp99_; -#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = self->priv->readers; -#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 28924 "Photo.c" +#line 29049 "Photo.c" } -#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28942 "Photo.c" +#line 29067 "Photo.c" } } } -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = only_attributes; -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp101_) { -#line 28950 "Photo.c" +#line 29075 "Photo.c" PhotoFileReader* _tmp102_; PhotoFileReader* _tmp103_; -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = reader; -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = old_reader; -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = _tmp102_ != _tmp103_; -#line 28959 "Photo.c" +#line 29084 "Photo.c" } else { -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = FALSE; -#line 28963 "Photo.c" +#line 29088 "Photo.c" } -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp100_) { -#line 28967 "Photo.c" +#line 29092 "Photo.c" GFile* _tmp104_ = NULL; PhotoFileReader* _tmp105_; GFile* _tmp108_ = NULL; PhotoFileReader* _tmp109_; -#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp105_ = old_reader; -#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4020 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp105_ != NULL) { -#line 28978 "Photo.c" +#line 29103 "Photo.c" PhotoFileReader* _tmp106_; GFile* _tmp107_; -#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = old_reader; -#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp107_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4020 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp104_); -#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = _tmp107_; -#line 28989 "Photo.c" +#line 29114 "Photo.c" } else { -#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4020 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp104_); -#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = NULL; -#line 28995 "Photo.c" +#line 29120 "Photo.c" } -#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp109_ = new_reader; -#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp109_ != NULL) { -#line 29001 "Photo.c" +#line 29126 "Photo.c" PhotoFileReader* _tmp110_; GFile* _tmp111_; -#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110_ = new_reader; -#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp111_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp108_); -#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = _tmp111_; -#line 29012 "Photo.c" +#line 29137 "Photo.c" } else { -#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp108_); -#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = NULL; -#line 29018 "Photo.c" +#line 29143 "Photo.c" } -#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4020 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_editable_replaced (self, _tmp104_, _tmp108_); -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp108_); -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp104_); -#line 29026 "Photo.c" +#line 29151 "Photo.c" } -#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4024 "/home/jens/Source/shotwell/src/Photo.vala" _tmp112_ = g_new0 (gchar*, 0 + 1); -#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4024 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = _tmp112_; -#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4024 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list_length1 = 0; -#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4024 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_list_size_ = alteration_list_length1; -#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4025 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = timestamp_changed; -#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4025 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp113_) { -#line 29040 "Photo.c" +#line 29165 "Photo.c" gchar** _tmp114_; gint _tmp114__length1; gchar* _tmp115_; @@ -29048,59 +29173,59 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF gint _tmp116__length1; gchar* _tmp117_; gboolean _tmp118_; -#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_ = alteration_list; -#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114__length1 = alteration_list_length1; -#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp115_ = g_strdup ("metadata:editable-timestamp"); -#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp115_); -#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4026 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp115_); +#line 4027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp116_ = alteration_list; -#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp116__length1 = alteration_list_length1; -#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp117_ = g_strdup ("metadata:baseline-timestamp"); -#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp117_); -#line 4010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4027 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp117_); +#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" _tmp118_ = photo_is_editable_source (self); -#line 4010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp118_) { -#line 29068 "Photo.c" +#line 29193 "Photo.c" gchar** _tmp119_; gint _tmp119__length1; gchar* _tmp120_; -#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" _tmp119_ = alteration_list; -#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" _tmp119__length1 = alteration_list_length1; -#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" _tmp120_ = g_strdup ("metadata:source-timestamp"); -#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_); -#line 29080 "Photo.c" +#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add109 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_); +#line 29205 "Photo.c" } } -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp122_ = filesize_changed; -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp122_) { -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = TRUE; -#line 29089 "Photo.c" +#line 29214 "Photo.c" } else { PhotoFileReader* _tmp123_; -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = new_reader; -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = _tmp123_ != NULL; -#line 29096 "Photo.c" +#line 29221 "Photo.c" } -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp121_) { -#line 29100 "Photo.c" +#line 29225 "Photo.c" gchar** _tmp124_; gint _tmp124__length1; gchar* _tmp125_; @@ -29108,79 +29233,79 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF gint _tmp126__length1; gchar* _tmp127_; gboolean _tmp128_; -#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124_ = alteration_list; -#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124__length1 = alteration_list_length1; -#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp125_ = g_strdup ("image:editable"); -#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp125_); -#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add110 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp125_); +#line 4035 "/home/jens/Source/shotwell/src/Photo.vala" _tmp126_ = alteration_list; -#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4035 "/home/jens/Source/shotwell/src/Photo.vala" _tmp126__length1 = alteration_list_length1; -#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4035 "/home/jens/Source/shotwell/src/Photo.vala" _tmp127_ = g_strdup ("image:baseline"); -#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp127_); -#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4035 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add111 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp127_); +#line 4037 "/home/jens/Source/shotwell/src/Photo.vala" _tmp128_ = photo_is_editable_source (self); -#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4037 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp128_) { -#line 29128 "Photo.c" +#line 29253 "Photo.c" gchar** _tmp129_; gint _tmp129__length1; gchar* _tmp130_; -#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp129_ = alteration_list; -#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp129__length1 = alteration_list_length1; -#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp130_ = g_strdup ("image:source"); -#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_); -#line 29140 "Photo.c" +#line 4038 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_array_add112 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_); +#line 29265 "Photo.c" } } -#line 4022 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" _tmp131_ = alteration_list; -#line 4022 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" _tmp131__length1 = alteration_list_length1; -#line 4022 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp131__length1 > 0) { -#line 29149 "Photo.c" +#line 29274 "Photo.c" gchar** _tmp132_; gint _tmp132__length1; Alteration* _tmp133_; Alteration* _tmp134_; -#line 4023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp132_ = alteration_list; -#line 4023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp132__length1 = alteration_list_length1; -#line 4023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp133_ = alteration_new_from_array (_tmp132_, _tmp132__length1); -#line 4023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp134_ = _tmp133_; -#line 4023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp134_); -#line 4023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp134_); -#line 29166 "Photo.c" +#line 29291 "Photo.c" } -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 29180 "Photo.c" +#line 29305 "Photo.c" } @@ -29196,96 +29321,96 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole gboolean _tmp43_ = FALSE; gboolean _tmp44_; GError * _inner_error_ = NULL; -#line 4026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4046 "/home/jens/Source/shotwell/src/Photo.vala" photo_halt_monitoring_editable (self); -#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4048 "/home/jens/Source/shotwell/src/Photo.vala" has_editable = FALSE; -#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4049 "/home/jens/Source/shotwell/src/Photo.vala" editable_file = NULL; -#line 29204 "Photo.c" +#line 29329 "Photo.c" { PhotoBackingReaders* _tmp0_; -#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 29211 "Photo.c" +#line 29336 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; -#line 4032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 4032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 4032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4051 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 29221 "Photo.c" +#line 29346 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; GFile* _tmp5_; PhotoBackingReaders* _tmp6_; -#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->editable; -#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" editable_file = _tmp5_; -#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4053 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->readers; -#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4053 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp6_->editable); -#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4053 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_->editable = NULL; -#line 4035 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" has_editable = TRUE; -#line 29244 "Photo.c" +#line 29369 "Photo.c" } } - __finally397: + __finally409: { PhotoBackingReaders* _tmp7_; -#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; -#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29254 "Photo.c" +#line 29379 "Photo.c" } -#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4050 "/home/jens/Source/shotwell/src/Photo.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 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29266 "Photo.c" +#line 29391 "Photo.c" } } -#line 4039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = has_editable; -#line 4039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4058 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 29273 "Photo.c" +#line 29398 "Photo.c" BackingPhotoID editable_id = {0}; -#line 4040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4059 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_id_init (&editable_id, BACKING_PHOTO_ID_INVALID); -#line 29277 "Photo.c" +#line 29402 "Photo.c" { { PhotoRow* _tmp9_; -#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 29285 "Photo.c" +#line 29410 "Photo.c" { PhotoRow* _tmp10_; BackingPhotoID _tmp11_; @@ -29293,237 +29418,237 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole PhotoRow* _tmp16_; BackingPhotoRow* _tmp17_; BackingPhotoRow* _tmp18_; -#line 4043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4062 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->row; -#line 4043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4062 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_->editable_id; -#line 4043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4062 "/home/jens/Source/shotwell/src/Photo.vala" editable_id = _tmp11_; -#line 4044 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4063 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = backing_photo_id_is_valid (&editable_id); -#line 4044 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4063 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 29303 "Photo.c" +#line 29428 "Photo.c" PhotoTable* _tmp13_; PhotoTable* _tmp14_; PhotoRow* _tmp15_; -#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4064 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_table_get_instance (); -#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4064 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_; -#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4064 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4064 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_detach_editable (_tmp14_, _tmp15_, &_inner_error_); -#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4064 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp14_); -#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4064 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29319 "Photo.c" - goto __finally399; +#line 29444 "Photo.c" + goto __finally411; } } -#line 4046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4065 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->row; -#line 4046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4065 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_->master; -#line 4046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4065 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _backing_photo_row_ref0 (_tmp17_); -#line 4046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4065 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); -#line 4046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4065 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = _tmp18_; -#line 29333 "Photo.c" +#line 29458 "Photo.c" } - __finally399: + __finally411: { PhotoRow* _tmp19_; -#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 29342 "Photo.c" +#line 29467 "Photo.c" } -#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 29348 "Photo.c" - goto __catch398_database_error; +#line 29473 "Photo.c" + goto __catch410_database_error; } -#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29359 "Photo.c" +#line 29484 "Photo.c" } } } - goto __finally398; - __catch398_database_error: + goto __finally410; + __catch410_database_error: { GError* err = NULL; GError* _tmp20_; const gchar* _tmp21_; -#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4060 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4060 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 4049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = err; -#line 4049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_->message; -#line 4049 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4049: Unable to remove editable from PhotoTable: %s", _tmp21_); -#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:4068: Unable to remove editable from PhotoTable: %s", _tmp21_); +#line 4060 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29381 "Photo.c" +#line 29506 "Photo.c" } - __finally398: -#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" + __finally410: +#line 4060 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4060 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4060 "/home/jens/Source/shotwell/src/Photo.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 4041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4060 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4060 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29394 "Photo.c" +#line 29519 "Photo.c" } { gboolean _tmp22_; -#line 4053 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = backing_photo_id_is_valid (&editable_id); -#line 4053 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_) { -#line 29402 "Photo.c" +#line 29527 "Photo.c" BackingPhotoTable* _tmp23_; BackingPhotoTable* _tmp24_; BackingPhotoID _tmp25_; -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4073 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = backing_photo_table_get_instance (); -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4073 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_; -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4073 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = editable_id; -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4073 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_remove (_tmp24_, &_tmp25_, &_inner_error_); -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4073 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp24_); -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4073 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4073 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 29420 "Photo.c" - goto __catch400_database_error; +#line 29545 "Photo.c" + goto __catch412_database_error; } -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4073 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4073 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4073 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4073 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29431 "Photo.c" +#line 29556 "Photo.c" } } } - goto __finally400; - __catch400_database_error: + goto __finally412; + __catch412_database_error: { GError* err = NULL; GError* _tmp26_; const gchar* _tmp27_; -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4071 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4071 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 4056 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4075 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = err; -#line 4056 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4075 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_->message; -#line 4056 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4056: Unable to remove editable from BackingPhotoTable: %s", _tmp27_); -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4075 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:4075: Unable to remove editable from BackingPhotoTable: %s", _tmp27_); +#line 4071 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29453 "Photo.c" +#line 29578 "Photo.c" } - __finally400: -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" + __finally412: +#line 4071 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4071 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4071 "/home/jens/Source/shotwell/src/Photo.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 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4071 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4071 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29466 "Photo.c" +#line 29591 "Photo.c" } } -#line 4060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4079 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = remove_transformations; -#line 4060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4079 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_) { -#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4080 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 29475 "Photo.c" +#line 29600 "Photo.c" } -#line 4063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = has_editable; -#line 4063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4082 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_) { -#line 29481 "Photo.c" +#line 29606 "Photo.c" GFile* _tmp30_; -#line 4064 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 4065 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = editable_file; -#line 4065 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_editable_replaced (self, _tmp30_, NULL); -#line 29489 "Photo.c" +#line 29614 "Photo.c" } -#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4087 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = delete_editable; -#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4087 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp32_) { -#line 29495 "Photo.c" +#line 29620 "Photo.c" GFile* _tmp33_; -#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4087 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = editable_file; -#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4087 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp33_ != NULL; -#line 29501 "Photo.c" +#line 29626 "Photo.c" } else { -#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4087 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = FALSE; -#line 29505 "Photo.c" +#line 29630 "Photo.c" } -#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4087 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp31_) { -#line 29509 "Photo.c" +#line 29634 "Photo.c" { GFile* _tmp34_; -#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4089 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = editable_file; -#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4089 "/home/jens/Source/shotwell/src/Photo.vala" g_file_trash (_tmp34_, NULL, &_inner_error_); -#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4089 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29518 "Photo.c" - goto __catch401_g_error; +#line 29643 "Photo.c" + goto __catch413_g_error; } } - goto __finally401; - __catch401_g_error: + goto __finally413; + __catch413_g_error: { GError* err = NULL; GFile* _tmp35_; @@ -29533,116 +29658,116 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole gchar* _tmp39_; GError* _tmp40_; const gchar* _tmp41_; -#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4088 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4088 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4091 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = editable_file; -#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4091 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = g_file_get_path (_tmp35_); -#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4091 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_; -#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4091 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4091 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp38_; -#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4091 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = err; -#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4091 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_->message; -#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4072: Unable to trash editable %s for %s: %s", _tmp37_, _tmp39_, _tmp41_); -#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4091 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:4091: Unable to trash editable %s for %s: %s", _tmp37_, _tmp39_, _tmp41_); +#line 4091 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp39_); -#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4091 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp37_); -#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4088 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29559 "Photo.c" +#line 29684 "Photo.c" } - __finally401: -#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" + __finally413: +#line 4088 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4088 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4088 "/home/jens/Source/shotwell/src/Photo.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 4069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4088 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4088 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29572 "Photo.c" +#line 29697 "Photo.c" } } -#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = has_editable; -#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp44_) { -#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = TRUE; -#line 29581 "Photo.c" +#line 29706 "Photo.c" } else { gboolean _tmp45_; -#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = remove_transformations; -#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp45_; -#line 29588 "Photo.c" +#line 29713 "Photo.c" } -#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp43_) { -#line 29592 "Photo.c" +#line 29717 "Photo.c" gboolean _tmp46_; -#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = notify; -#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp46_; -#line 29598 "Photo.c" +#line 29723 "Photo.c" } else { -#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = FALSE; -#line 29602 "Photo.c" +#line 29727 "Photo.c" } -#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp42_) { -#line 29606 "Photo.c" +#line 29731 "Photo.c" Alteration* _tmp47_; Alteration* _tmp48_; -#line 4078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4097 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = alteration_new ("image", "revert"); -#line 4078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4097 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_; -#line 4078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4097 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp48_); -#line 4078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4097 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp48_); -#line 29617 "Photo.c" +#line 29742 "Photo.c" } -#line 4026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 29621 "Photo.c" +#line 29746 "Photo.c" } static void _photo_on_reimport_editable_one_shot_callback (gpointer self) { -#line 4100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4119 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_reimport_editable ((Photo*) self); -#line 29628 "Photo.c" +#line 29753 "Photo.c" } static void _photo_on_update_editable_attributes_one_shot_callback (gpointer self) { -#line 4109 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4128 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_update_editable_attributes ((Photo*) self); -#line 29635 "Photo.c" +#line 29760 "Photo.c" } static void _photo_on_remove_editable_one_shot_callback (gpointer self) { -#line 4118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4137 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_remove_editable ((Photo*) self); -#line 29642 "Photo.c" +#line 29767 "Photo.c" } @@ -29654,20 +29779,20 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth gchar* _tmp16_; GFileMonitorEvent _tmp17_; GError * _inner_error_ = NULL; -#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4100 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4100 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); -#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4100 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file)); -#line 29660 "Photo.c" +#line 29785 "Photo.c" { PhotoBackingReaders* _tmp0_; -#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4102 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 29667 "Photo.c" +#line 29792 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -29678,181 +29803,181 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth GFile* _tmp7_; gboolean _tmp8_; gboolean _tmp9_; -#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4103 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp2_ != NULL, "readers.editable != null"); -#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; -#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->editable; -#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_file_equal (_tmp3_, _tmp7_); -#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = !_tmp8_; -#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp7_); -#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp9_) { -#line 29702 "Photo.c" +#line 29827 "Photo.c" { PhotoBackingReaders* _tmp10_; -#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->priv->readers; -#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4102 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29709 "Photo.c" +#line 29834 "Photo.c" } -#line 4090 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4109 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29713 "Photo.c" +#line 29838 "Photo.c" } } - __finally402: + __finally414: { PhotoBackingReaders* _tmp11_; -#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->priv->readers; -#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4102 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29723 "Photo.c" +#line 29848 "Photo.c" } -#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4102 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4102 "/home/jens/Source/shotwell/src/Photo.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 4083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4102 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4102 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29733 "Photo.c" +#line 29858 "Photo.c" } } -#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = event; -#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp12_); -#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = file; -#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = g_file_get_path (_tmp14_); -#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4094: EDITABLE %s: %s", (_tmp13_ != NULL) ? _tmp13_->value_name : NULL, _tmp16_); -#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:4113: EDITABLE %s: %s", (_tmp13_ != NULL) ? _tmp13_->value_name : NULL, _tmp16_); +#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp16_); -#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4115 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = event; -#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4115 "/home/jens/Source/shotwell/src/Photo.vala" switch (_tmp17_) { -#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CHANGED: -#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CREATED: -#line 29758 "Photo.c" +#line 29883 "Photo.c" { OneShotScheduler* _tmp18_; OneShotScheduler* _tmp20_; -#line 4099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->priv->reimport_editable_scheduler; -#line 4099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4118 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_ == NULL) { -#line 29766 "Photo.c" +#line 29891 "Photo.c" OneShotScheduler* _tmp19_; -#line 4100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = one_shot_scheduler_new ("Photo.reimport_editable", _photo_on_reimport_editable_one_shot_callback, self); -#line 4100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4119 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->reimport_editable_scheduler); -#line 4100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4119 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->reimport_editable_scheduler = _tmp19_; -#line 29774 "Photo.c" +#line 29899 "Photo.c" } -#line 4104 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4123 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->priv->reimport_editable_scheduler; -#line 4104 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4123 "/home/jens/Source/shotwell/src/Photo.vala" one_shot_scheduler_after_timeout (_tmp20_, (guint) 1000, TRUE); -#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4124 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29782 "Photo.c" +#line 29907 "Photo.c" } -#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: -#line 29786 "Photo.c" +#line 29911 "Photo.c" { OneShotScheduler* _tmp21_; OneShotScheduler* _tmp23_; -#line 4108 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4127 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = self->priv->update_editable_attributes_scheduler; -#line 4108 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4127 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_ == NULL) { -#line 29794 "Photo.c" +#line 29919 "Photo.c" OneShotScheduler* _tmp22_; -#line 4109 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4128 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = one_shot_scheduler_new ("Photo.update_editable_attributes", _photo_on_update_editable_attributes_one_shot_callback, self); -#line 4109 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4128 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->update_editable_attributes_scheduler); -#line 4109 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4128 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->update_editable_attributes_scheduler = _tmp22_; -#line 29802 "Photo.c" +#line 29927 "Photo.c" } -#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4132 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = self->priv->update_editable_attributes_scheduler; -#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4132 "/home/jens/Source/shotwell/src/Photo.vala" one_shot_scheduler_after_timeout (_tmp23_, (guint) 1000, TRUE); -#line 4114 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4133 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29810 "Photo.c" +#line 29935 "Photo.c" } -#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_DELETED: -#line 29814 "Photo.c" +#line 29939 "Photo.c" { OneShotScheduler* _tmp24_; OneShotScheduler* _tmp26_; -#line 4117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4136 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = self->priv->remove_editable_scheduler; -#line 4117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4136 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_ == NULL) { -#line 29822 "Photo.c" +#line 29947 "Photo.c" OneShotScheduler* _tmp25_; -#line 4118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4137 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = one_shot_scheduler_new ("Photo.remove_editable", _photo_on_remove_editable_one_shot_callback, self); -#line 4118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4137 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->remove_editable_scheduler); -#line 4118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4137 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->remove_editable_scheduler = _tmp25_; -#line 29830 "Photo.c" +#line 29955 "Photo.c" } -#line 4122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = self->priv->remove_editable_scheduler; -#line 4122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" one_shot_scheduler_after_timeout (_tmp26_, (guint) 3000, TRUE); -#line 4123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4142 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29838 "Photo.c" +#line 29963 "Photo.c" } default: -#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -#line 29843 "Photo.c" +#line 29968 "Photo.c" { -#line 4128 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4147 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29847 "Photo.c" +#line 29972 "Photo.c" } } -#line 4133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4152 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_prefetched (self); -#line 29852 "Photo.c" +#line 29977 "Photo.c" } @@ -29860,67 +29985,67 @@ static void photo_on_reimport_editable (Photo* self) { gchar* _tmp0_; gchar* _tmp1_; GError * _inner_error_ = NULL; -#line 4136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4155 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4157 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_prefetched (self); -#line 4140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4159 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 4140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4159 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4140 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4140: Reimporting editable for %s", _tmp1_); -#line 4140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4159 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:4159: Reimporting editable for %s", _tmp1_); +#line 4159 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp1_); -#line 29872 "Photo.c" +#line 29997 "Photo.c" { -#line 4142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4161 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable (self, &_inner_error_); -#line 4142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4161 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29878 "Photo.c" - goto __catch403_g_error; +#line 30003 "Photo.c" + goto __catch415_g_error; } } - goto __finally403; - __catch403_g_error: + goto __finally415; + __catch415_g_error: { GError* err = NULL; gchar* _tmp2_; gchar* _tmp3_; GError* _tmp4_; const gchar* _tmp5_; -#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4160 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4160 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 4144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 4144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 4144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = err; -#line 4144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->message; -#line 4144 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4144: Unable to reimport photo %s changed by external edito" \ +#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:4163: Unable to reimport photo %s changed by external edito" \ "r: %s", _tmp3_, _tmp5_); -#line 4144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp3_); -#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4160 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29908 "Photo.c" +#line 30033 "Photo.c" } - __finally403: -#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" + __finally415: +#line 4160 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4160 "/home/jens/Source/shotwell/src/Photo.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 4141 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4160 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4160 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29919 "Photo.c" +#line 30044 "Photo.c" } } @@ -29929,56 +30054,56 @@ static void photo_on_update_editable_attributes (Photo* self) { gchar* _tmp0_; gchar* _tmp1_; GError * _inner_error_ = NULL; -#line 4149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4168 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4169 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 4150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4169 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4150 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4150: Updating editable attributes for %s", _tmp1_); -#line 4150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4169 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:4169: Updating editable attributes for %s", _tmp1_); +#line 4169 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp1_); -#line 29938 "Photo.c" +#line 30063 "Photo.c" { -#line 4152 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4171 "/home/jens/Source/shotwell/src/Photo.vala" photo_update_editable_attributes (self, &_inner_error_); -#line 4152 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4171 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29944 "Photo.c" - goto __catch404_g_error; +#line 30069 "Photo.c" + goto __catch416_g_error; } } - goto __finally404; - __catch404_g_error: + goto __finally416; + __catch416_g_error: { GError* err = NULL; GError* _tmp2_; const gchar* _tmp3_; -#line 4151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4170 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 4151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4170 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 4154 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4173 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = err; -#line 4154 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4173 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->message; -#line 4154 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4154: Unable to update editable attributes: %s", _tmp3_); -#line 4151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4173 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:4173: Unable to update editable attributes: %s", _tmp3_); +#line 4170 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29966 "Photo.c" +#line 30091 "Photo.c" } - __finally404: -#line 4151 "/home/jens/Source/shotwell/src/Photo.vala" + __finally416: +#line 4170 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4170 "/home/jens/Source/shotwell/src/Photo.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 4151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4170 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4170 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29977 "Photo.c" +#line 30102 "Photo.c" } } @@ -29994,68 +30119,68 @@ static void photo_on_remove_editable (Photo* self) { gboolean _tmp5_; gchar* _tmp8_; gchar* _tmp9_; -#line 4158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4177 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4178 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_editable_reader (self); -#line 4159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4178 "/home/jens/Source/shotwell/src/Photo.vala" reader = _tmp0_; -#line 4160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = reader; -#line 4160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4179 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 4161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4180 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 4161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4180 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30007 "Photo.c" +#line 30132 "Photo.c" } -#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4182 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; -#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4182 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4182 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp3_; -#line 4164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = file; -#line 4164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = g_file_query_exists (_tmp4_, NULL); -#line 4164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4183 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 30021 "Photo.c" +#line 30146 "Photo.c" gchar* _tmp6_; gchar* _tmp7_; -#line 4165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4184 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 4165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4184 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 4165 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4165: Not removing editable for %s: file exists", _tmp7_); -#line 4165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4184 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:4184: Not removing editable for %s: file exists", _tmp7_); +#line 4184 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp7_); -#line 4167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4186 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 4167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4186 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 4167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4186 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30038 "Photo.c" +#line 30163 "Photo.c" } -#line 4170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4189 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 4170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4189 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 4170 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4170: Removing editable for %s: file no longer exists", _tmp9_); -#line 4170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4189 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:4189: Removing editable for %s: file no longer exists", _tmp9_); +#line 4189 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp9_); -#line 4171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4190 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, FALSE, TRUE, TRUE); -#line 4158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4177 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 4158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4177 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 30054 "Photo.c" +#line 30179 "Photo.c" } @@ -30066,25 +30191,25 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) { Orientation _tmp1_; Dimensions _tmp2_; Dimensions _tmp3_ = {0}; -#line 4179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4198 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4199 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_raw_dimensions (self, &_tmp0_); -#line 4180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4199 "/home/jens/Source/shotwell/src/Photo.vala" dim = _tmp0_; -#line 4181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4200 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_orientation (self); -#line 4181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4200 "/home/jens/Source/shotwell/src/Photo.vala" orientation = _tmp1_; -#line 4183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4202 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = dim; -#line 4183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4202 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_dimensions (orientation, &_tmp2_, &_tmp3_); -#line 4183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4202 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp3_; -#line 4183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4202 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30083 "Photo.c" +#line 30208 "Photo.c" } @@ -30092,19 +30217,19 @@ void photo_get_master_dimensions (Photo* self, Dimensions* result) { Orientation _tmp0_; Dimensions _tmp1_ = {0}; Dimensions _tmp2_ = {0}; -#line 4187 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4206 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4207 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_original_orientation (self); -#line 4188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4207 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_raw_dimensions (self, &_tmp1_); -#line 4188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4207 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_dimensions (_tmp0_, &_tmp1_, &_tmp2_); -#line 4188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4207 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 4188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4207 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30103 "Photo.c" +#line 30228 "Photo.c" } @@ -30120,77 +30245,77 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { Orientation _tmp3_; PhotoException _tmp4_; gboolean _tmp5_; -#line 4192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4211 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 4194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4213 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_raw_crop (self, &_tmp0_); -#line 4194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4213 "/home/jens/Source/shotwell/src/Photo.vala" raw = _tmp0_; -#line 4194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4213 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp1_) { -#line 4195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4214 "/home/jens/Source/shotwell/src/Photo.vala" box_init (&_vala_crop, 0, 0, 0, 0); -#line 4197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 4197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" if (crop) { -#line 4197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 30135 "Photo.c" +#line 30260 "Photo.c" } -#line 4197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30139 "Photo.c" +#line 30264 "Photo.c" } -#line 4200 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_ORIENTATION, &_tmp2_); -#line 4200 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" dim = _tmp2_; -#line 4201 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4220 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_orientation (self); -#line 4201 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4220 "/home/jens/Source/shotwell/src/Photo.vala" orientation = _tmp3_; -#line 4203 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = exceptions; -#line 4203 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_exception_allows (_tmp4_, PHOTO_EXCEPTION_ORIENTATION); -#line 4203 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 30155 "Photo.c" +#line 30280 "Photo.c" Orientation _tmp6_; Dimensions _tmp7_; Box _tmp8_; Box _tmp9_ = {0}; -#line 4204 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = orientation; -#line 4204 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = dim; -#line 4204 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = raw; -#line 4204 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4223 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_box (_tmp6_, &_tmp7_, &_tmp8_, &_tmp9_); -#line 4204 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4223 "/home/jens/Source/shotwell/src/Photo.vala" _vala_crop = _tmp9_; -#line 30170 "Photo.c" +#line 30295 "Photo.c" } else { Box _tmp10_; -#line 4206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4225 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = raw; -#line 4206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4225 "/home/jens/Source/shotwell/src/Photo.vala" _vala_crop = _tmp10_; -#line 30177 "Photo.c" +#line 30302 "Photo.c" } -#line 4208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4227 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4227 "/home/jens/Source/shotwell/src/Photo.vala" if (crop) { -#line 4208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4227 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 30185 "Photo.c" +#line 30310 "Photo.c" } -#line 4208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4227 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30189 "Photo.c" +#line 30314 "Photo.c" } @@ -30228,87 +30353,87 @@ void photo_set_crop (Photo* self, Box* crop) { gint _tmp27_; gint _tmp28_; Box _tmp29_; -#line 4212 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4231 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4212 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4231 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (crop != NULL); -#line 4213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4232 "/home/jens/Source/shotwell/src/Photo.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_ORIENTATION, &_tmp0_); -#line 4213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4232 "/home/jens/Source/shotwell/src/Photo.vala" dim = _tmp0_; -#line 4214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4233 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_orientation (self); -#line 4214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4233 "/home/jens/Source/shotwell/src/Photo.vala" orientation = _tmp1_; -#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4235 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = dim; -#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4235 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = *crop; -#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4235 "/home/jens/Source/shotwell/src/Photo.vala" orientation_derotate_box (orientation, &_tmp2_, &_tmp3_, &_tmp4_); -#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4235 "/home/jens/Source/shotwell/src/Photo.vala" derotated = _tmp4_; -#line 4218 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4237 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = derotated; -#line 4218 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4237 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_.left; -#line 4218 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4237 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = dim; -#line 4218 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4237 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_.width; -#line 4218 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4237 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = CLAMP (_tmp6_, 0, _tmp8_ - 2); -#line 4218 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4237 "/home/jens/Source/shotwell/src/Photo.vala" derotated.left = _tmp9_; -#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = derotated; -#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_.right; -#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = derotated; -#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_.left; -#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = dim; -#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_.width; -#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = CLAMP (_tmp11_, _tmp13_, _tmp15_ - 1); -#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" derotated.right = _tmp16_; -#line 4221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = derotated; -#line 4221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_.top; -#line 4221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = dim; -#line 4221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_.height; -#line 4221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = CLAMP (_tmp18_, 0, _tmp20_ - 2); -#line 4221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4240 "/home/jens/Source/shotwell/src/Photo.vala" derotated.top = _tmp21_; -#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = derotated; -#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_.bottom; -#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = derotated; -#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_.top; -#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = dim; -#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_.height; -#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = CLAMP (_tmp23_, _tmp25_, _tmp27_ - 1); -#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4241 "/home/jens/Source/shotwell/src/Photo.vala" derotated.bottom = _tmp28_; -#line 4224 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4243 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = derotated; -#line 4224 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4243 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_raw_crop (self, &_tmp29_); -#line 30307 "Photo.c" +#line 30432 "Photo.c" } @@ -30317,49 +30442,49 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) { gboolean result = FALSE; gdouble _tmp0_ = 0.0; gboolean _tmp1_; -#line 4227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4246 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 4228 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4247 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_raw_straighten (self, &_tmp0_); -#line 4228 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4247 "/home/jens/Source/shotwell/src/Photo.vala" _vala_theta = _tmp0_; -#line 4228 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4247 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp1_) { -#line 4229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4248 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 4229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4248 "/home/jens/Source/shotwell/src/Photo.vala" if (theta) { -#line 4229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4248 "/home/jens/Source/shotwell/src/Photo.vala" *theta = _vala_theta; -#line 30330 "Photo.c" +#line 30455 "Photo.c" } -#line 4229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4248 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30334 "Photo.c" +#line 30459 "Photo.c" } -#line 4231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" if (theta) { -#line 4231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" *theta = _vala_theta; -#line 30342 "Photo.c" +#line 30467 "Photo.c" } -#line 4231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30346 "Photo.c" +#line 30471 "Photo.c" } void photo_set_straighten (Photo* self, gdouble theta) { gdouble _tmp0_; -#line 4234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4235 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4254 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = theta; -#line 4235 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4254 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_raw_straighten (self, _tmp0_); -#line 30358 "Photo.c" +#line 30483 "Photo.c" } @@ -30417,48 +30542,48 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp96__length1; GdkPixbuf* _tmp133_; GdkPixbuf* _tmp134_; -#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4257 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4257 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); -#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4257 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (inst != NULL, NULL); -#line 4248 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4267 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = *inst; -#line 4248 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4267 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_.radius; -#line 4248 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4267 "/home/jens/Source/shotwell/src/Photo.vala" r = (gdouble) _tmp1_; -#line 4249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = *inst; -#line 4249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_.radius; -#line 4249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = g_new0 (gint, _tmp3_ + 1); -#line 4249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" x_insets_first_quadrant = _tmp4_; -#line 4249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" x_insets_first_quadrant_length1 = _tmp3_ + 1; -#line 4249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" _x_insets_first_quadrant_size_ = x_insets_first_quadrant_length1; -#line 4251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" i = 0; -#line 30442 "Photo.c" +#line 30567 "Photo.c" { gdouble y = 0.0; gdouble _tmp5_; -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = r; -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" y = _tmp5_; -#line 30450 "Photo.c" +#line 30575 "Photo.c" { gboolean _tmp6_ = FALSE; -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = TRUE; -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30457 "Photo.c" +#line 30582 "Photo.c" gdouble _tmp8_; gdouble theta = 0.0; gdouble _tmp9_; @@ -30476,178 +30601,178 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp19_; gint _tmp20_; gint _tmp21_; -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp6_) { -#line 30477 "Photo.c" +#line 30602 "Photo.c" gdouble _tmp7_; -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = y; -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" y = _tmp7_ - 1.0; -#line 30483 "Photo.c" +#line 30608 "Photo.c" } -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = y; -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp8_ >= 0.0)) { -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30493 "Photo.c" +#line 30618 "Photo.c" } -#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = y; -#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = r; -#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = asin (_tmp9_ / _tmp10_); -#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" theta = _tmp11_; -#line 4254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = r; -#line 4254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = theta; -#line 4254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = cos (_tmp13_); -#line 4254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" x = (gint) ((_tmp12_ * _tmp14_) + 0.5); -#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = x_insets_first_quadrant; -#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15__length1 = x_insets_first_quadrant_length1; -#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = i; -#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = *inst; -#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_.radius; -#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = x; -#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_[_tmp16_] = _tmp18_ - _tmp19_; -#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp15_[_tmp16_]; -#line 4257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = i; -#line 4257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" i = _tmp21_ + 1; -#line 30531 "Photo.c" +#line 30656 "Photo.c" } } } -#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = *inst; -#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_.center; -#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_.x; -#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = *inst; -#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_.radius; -#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4279 "/home/jens/Source/shotwell/src/Photo.vala" x_bounds_min = _tmp24_ - _tmp26_; -#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4280 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = *inst; -#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4280 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_.center; -#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4280 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp28_.x; -#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4280 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = *inst; -#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4280 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_.radius; -#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4280 "/home/jens/Source/shotwell/src/Photo.vala" x_bounds_max = _tmp29_ + _tmp31_; -#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = *inst; -#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_.center; -#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_.y; -#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = *inst; -#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = _tmp35_.radius; -#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4281 "/home/jens/Source/shotwell/src/Photo.vala" ymin = _tmp34_ - _tmp36_; -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = ymin; -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4282 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp38_ < 0) { -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = 0; -#line 30577 "Photo.c" +#line 30702 "Photo.c" } else { gint _tmp39_; -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = ymin; -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp39_; -#line 30584 "Photo.c" +#line 30709 "Photo.c" } -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4282 "/home/jens/Source/shotwell/src/Photo.vala" ymin = _tmp37_; -#line 4264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = *inst; -#line 4264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_.center; -#line 4264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_.y; -#line 4264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4283 "/home/jens/Source/shotwell/src/Photo.vala" ymax = _tmp42_; -#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = ymax; -#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = pixbuf; -#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = gdk_pixbuf_get_height (_tmp45_); -#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _tmp46_; -#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp44_ > (_tmp47_ - 1)) { -#line 30606 "Photo.c" +#line 30731 "Photo.c" GdkPixbuf* _tmp48_; gint _tmp49_; gint _tmp50_; -#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = pixbuf; -#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = gdk_pixbuf_get_height (_tmp48_); -#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = _tmp49_; -#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp50_ - 1; -#line 30618 "Photo.c" +#line 30743 "Photo.c" } else { gint _tmp51_; -#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = ymax; -#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp51_; -#line 30625 "Photo.c" +#line 30750 "Photo.c" } -#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" ymax = _tmp43_; -#line 4269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = 0; -#line 30631 "Photo.c" +#line 30756 "Photo.c" { gint y_it = 0; gint _tmp52_; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = ymin; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" y_it = _tmp52_; -#line 30639 "Photo.c" +#line 30764 "Photo.c" { gboolean _tmp53_ = FALSE; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = TRUE; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30646 "Photo.c" +#line 30771 "Photo.c" gint _tmp55_; gint _tmp56_; gint xmin = 0; @@ -30670,118 +30795,118 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp71_; gint _tmp72_; gint _tmp87_; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp53_) { -#line 30671 "Photo.c" +#line 30796 "Photo.c" gint _tmp54_; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = y_it; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" y_it = _tmp54_ + 1; -#line 30677 "Photo.c" +#line 30802 "Photo.c" } -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = FALSE; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = y_it; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = ymax; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp55_ <= _tmp56_)) { -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30689 "Photo.c" +#line 30814 "Photo.c" } -#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = x_bounds_min; -#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = x_insets_first_quadrant; -#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58__length1 = x_insets_first_quadrant_length1; -#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = inset_index; -#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = _tmp58_[_tmp59_]; -#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" xmin = _tmp57_ + _tmp60_; -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = xmin; -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp62_ < 0) { -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = 0; -#line 30709 "Photo.c" +#line 30834 "Photo.c" } else { gint _tmp63_; -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = xmin; -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _tmp63_; -#line 30716 "Photo.c" +#line 30841 "Photo.c" } -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" xmin = _tmp61_; -#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = x_bounds_max; -#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = x_insets_first_quadrant; -#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65__length1 = x_insets_first_quadrant_length1; -#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = inset_index; -#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = _tmp65_[_tmp66_]; -#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4292 "/home/jens/Source/shotwell/src/Photo.vala" xmax = _tmp64_ - _tmp67_; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = xmax; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = pixbuf; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = gdk_pixbuf_get_width (_tmp70_); -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = _tmp71_; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp69_ > (_tmp72_ - 1)) { -#line 30742 "Photo.c" +#line 30867 "Photo.c" GdkPixbuf* _tmp73_; gint _tmp74_; gint _tmp75_; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = pixbuf; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = gdk_pixbuf_get_width (_tmp73_); -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = _tmp74_; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = _tmp75_ - 1; -#line 30754 "Photo.c" +#line 30879 "Photo.c" } else { gint _tmp76_; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = xmax; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = _tmp76_; -#line 30761 "Photo.c" +#line 30886 "Photo.c" } -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" xmax = _tmp68_; -#line 30765 "Photo.c" +#line 30890 "Photo.c" { gint x_it = 0; gint _tmp77_; -#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = xmin; -#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4295 "/home/jens/Source/shotwell/src/Photo.vala" x_it = _tmp77_; -#line 30773 "Photo.c" +#line 30898 "Photo.c" { gboolean _tmp78_ = FALSE; -#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = TRUE; -#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4295 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30780 "Photo.c" +#line 30905 "Photo.c" gint _tmp80_; gint _tmp81_; GdkPixbuf* _tmp82_; @@ -30789,94 +30914,94 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp84_; GdkPixbuf* _tmp85_; GdkPixbuf* _tmp86_; -#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4295 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp78_) { -#line 30790 "Photo.c" +#line 30915 "Photo.c" gint _tmp79_; -#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = x_it; -#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4295 "/home/jens/Source/shotwell/src/Photo.vala" x_it = _tmp79_ + 1; -#line 30796 "Photo.c" +#line 30921 "Photo.c" } -#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = FALSE; -#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = x_it; -#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = xmax; -#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4295 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp80_ <= _tmp81_)) { -#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4295 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30808 "Photo.c" +#line 30933 "Photo.c" } -#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = pixbuf; -#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = x_it; -#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = y_it; -#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = photo_red_reduce_pixel (self, _tmp82_, _tmp83_, _tmp84_); -#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = _tmp85_; -#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4296 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp86_); -#line 30822 "Photo.c" +#line 30947 "Photo.c" } } } -#line 4279 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4298 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = inset_index; -#line 4279 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4298 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = _tmp87_ + 1; -#line 30830 "Photo.c" +#line 30955 "Photo.c" } } } -#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = *inst; -#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = _tmp88_.center; -#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tmp89_.y; -#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" ymin = _tmp90_; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = *inst; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = _tmp91_.center; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = _tmp92_.y; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = *inst; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = _tmp94_.radius; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4304 "/home/jens/Source/shotwell/src/Photo.vala" ymax = _tmp93_ + _tmp95_; -#line 4286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = x_insets_first_quadrant; -#line 4286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96__length1 = x_insets_first_quadrant_length1; -#line 4286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4305 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = _tmp96__length1 - 1; -#line 30860 "Photo.c" +#line 30985 "Photo.c" { gint y_it = 0; gint _tmp97_; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = ymin; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4306 "/home/jens/Source/shotwell/src/Photo.vala" y_it = _tmp97_; -#line 30868 "Photo.c" +#line 30993 "Photo.c" { gboolean _tmp98_ = FALSE; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = TRUE; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4306 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30875 "Photo.c" +#line 31000 "Photo.c" gint _tmp100_; gint _tmp101_; gint xmin = 0; @@ -30899,118 +31024,118 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp116_; gint _tmp117_; gint _tmp132_; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4306 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp98_) { -#line 30900 "Photo.c" +#line 31025 "Photo.c" gint _tmp99_; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = y_it; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4306 "/home/jens/Source/shotwell/src/Photo.vala" y_it = _tmp99_ + 1; -#line 30906 "Photo.c" +#line 31031 "Photo.c" } -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = FALSE; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = y_it; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = ymax; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4306 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp100_ <= _tmp101_)) { -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4306 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30918 "Photo.c" +#line 31043 "Photo.c" } -#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = x_bounds_min; -#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = x_insets_first_quadrant; -#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103__length1 = x_insets_first_quadrant_length1; -#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = inset_index; -#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp105_ = _tmp103_[_tmp104_]; -#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4307 "/home/jens/Source/shotwell/src/Photo.vala" xmin = _tmp102_ + _tmp105_; -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp107_ = xmin; -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp107_ < 0) { -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = 0; -#line 30938 "Photo.c" +#line 31063 "Photo.c" } else { gint _tmp108_; -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = xmin; -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = _tmp108_; -#line 30945 "Photo.c" +#line 31070 "Photo.c" } -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" xmin = _tmp106_; -#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp109_ = x_bounds_max; -#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110_ = x_insets_first_quadrant; -#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110__length1 = x_insets_first_quadrant_length1; -#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp111_ = inset_index; -#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp112_ = _tmp110_[_tmp111_]; -#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4309 "/home/jens/Source/shotwell/src/Photo.vala" xmax = _tmp109_ - _tmp112_; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_ = xmax; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp115_ = pixbuf; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp116_ = gdk_pixbuf_get_width (_tmp115_); -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp117_ = _tmp116_; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp114_ > (_tmp117_ - 1)) { -#line 30971 "Photo.c" +#line 31096 "Photo.c" GdkPixbuf* _tmp118_; gint _tmp119_; gint _tmp120_; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp118_ = pixbuf; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp119_ = gdk_pixbuf_get_width (_tmp118_); -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp120_ = _tmp119_; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = _tmp120_ - 1; -#line 30983 "Photo.c" +#line 31108 "Photo.c" } else { gint _tmp121_; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = xmax; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = _tmp121_; -#line 30990 "Photo.c" +#line 31115 "Photo.c" } -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" xmax = _tmp113_; -#line 30994 "Photo.c" +#line 31119 "Photo.c" { gint x_it = 0; gint _tmp122_; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp122_ = xmin; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4312 "/home/jens/Source/shotwell/src/Photo.vala" x_it = _tmp122_; -#line 31002 "Photo.c" +#line 31127 "Photo.c" { gboolean _tmp123_ = FALSE; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = TRUE; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4312 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 31009 "Photo.c" +#line 31134 "Photo.c" gint _tmp125_; gint _tmp126_; GdkPixbuf* _tmp127_; @@ -31018,63 +31143,63 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp129_; GdkPixbuf* _tmp130_; GdkPixbuf* _tmp131_; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4312 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp123_) { -#line 31019 "Photo.c" +#line 31144 "Photo.c" gint _tmp124_; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124_ = x_it; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4312 "/home/jens/Source/shotwell/src/Photo.vala" x_it = _tmp124_ + 1; -#line 31025 "Photo.c" +#line 31150 "Photo.c" } -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = FALSE; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp125_ = x_it; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp126_ = xmax; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4312 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp125_ <= _tmp126_)) { -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4312 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 31037 "Photo.c" +#line 31162 "Photo.c" } -#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp127_ = pixbuf; -#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp128_ = x_it; -#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp129_ = y_it; -#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp130_ = photo_red_reduce_pixel (self, _tmp127_, _tmp128_, _tmp129_); -#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp131_ = _tmp130_; -#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4313 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp131_); -#line 31051 "Photo.c" +#line 31176 "Photo.c" } } } -#line 4296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp132_ = inset_index; -#line 4296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4315 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = _tmp132_ - 1; -#line 31059 "Photo.c" +#line 31184 "Photo.c" } } } -#line 4299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4318 "/home/jens/Source/shotwell/src/Photo.vala" _tmp133_ = pixbuf; -#line 4299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4318 "/home/jens/Source/shotwell/src/Photo.vala" _tmp134_ = _g_object_ref0 (_tmp133_); -#line 4299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4318 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp134_; -#line 4299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4318 "/home/jens/Source/shotwell/src/Photo.vala" x_insets_first_quadrant = (g_free (x_insets_first_quadrant), NULL); -#line 4299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4318 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31073 "Photo.c" +#line 31198 "Photo.c" } @@ -31093,89 +31218,89 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x gint _tmp9_; GdkPixbuf* _tmp33_; GdkPixbuf* _tmp34_; -#line 4302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4321 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 4302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4321 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); -#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = y; -#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = pixbuf; -#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gdk_pixbuf_get_rowstride (_tmp1_); -#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = x; -#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = pixbuf; -#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_); -#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" px_start_byte_offset = (_tmp0_ * _tmp2_) + (_tmp3_ * _tmp5_); -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = x; -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp9_ >= 0) { -#line 31114 "Photo.c" +#line 31239 "Photo.c" gint _tmp10_; -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = y; -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp10_ >= 0; -#line 31120 "Photo.c" +#line 31245 "Photo.c" } else { -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = FALSE; -#line 31124 "Photo.c" +#line 31249 "Photo.c" } -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 31128 "Photo.c" +#line 31253 "Photo.c" gint _tmp11_; GdkPixbuf* _tmp12_; gint _tmp13_; gint _tmp14_; -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = x; -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = pixbuf; -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = gdk_pixbuf_get_width (_tmp12_); -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_; -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp11_ < _tmp14_; -#line 31143 "Photo.c" +#line 31268 "Photo.c" } else { -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = FALSE; -#line 31147 "Photo.c" +#line 31272 "Photo.c" } -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { -#line 31151 "Photo.c" +#line 31276 "Photo.c" gint _tmp15_; GdkPixbuf* _tmp16_; gint _tmp17_; gint _tmp18_; -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = y; -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = pixbuf; -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = gdk_pixbuf_get_height (_tmp16_); -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_; -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp15_ < _tmp18_; -#line 31166 "Photo.c" +#line 31291 "Photo.c" } else { -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; -#line 31170 "Photo.c" +#line 31295 "Photo.c" } -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 31174 "Photo.c" +#line 31299 "Photo.c" guchar* pixel_data = NULL; GdkPixbuf* _tmp19_; guint8* _tmp20_; @@ -31199,65 +31324,65 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x gint _tmp30_; guchar _tmp31_; guchar _tmp32_; -#line 4311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4330 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = pixbuf; -#line 4311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4330 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = gdk_pixbuf_get_pixels (_tmp19_); -#line 4311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4330 "/home/jens/Source/shotwell/src/Photo.vala" pixel_data = _tmp20_; -#line 4311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4330 "/home/jens/Source/shotwell/src/Photo.vala" pixel_data_length1 = -1; -#line 4311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4330 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_data_size_ = pixel_data_length1; -#line 4321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = pixel_data; -#line 4321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21__length1 = pixel_data_length1; -#line 4321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = px_start_byte_offset; -#line 4321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp21_[_tmp22_ + 1]; -#line 4321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4340 "/home/jens/Source/shotwell/src/Photo.vala" g = _tmp23_; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = pixel_data; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24__length1 = pixel_data_length1; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = px_start_byte_offset; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp24_[_tmp25_ + 2]; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4341 "/home/jens/Source/shotwell/src/Photo.vala" b = _tmp26_; -#line 4324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4343 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = g; -#line 4324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4343 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = b; -#line 4324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4343 "/home/jens/Source/shotwell/src/Photo.vala" r = (guchar) ((_tmp27_ + _tmp28_) / 2); -#line 4326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = pixel_data; -#line 4326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29__length1 = pixel_data_length1; -#line 4326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = px_start_byte_offset; -#line 4326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = r; -#line 4326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_[_tmp30_] = _tmp31_; -#line 4326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp29_[_tmp30_]; -#line 31246 "Photo.c" +#line 31371 "Photo.c" } -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4348 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = pixbuf; -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4348 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _g_object_ref0 (_tmp33_); -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4348 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp34_; -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4348 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31256 "Photo.c" +#line 31381 "Photo.c" } @@ -31282,78 +31407,78 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin gint _tmp15_; gint _tmp16_; gint _tmp17_; -#line 4332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4351 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4351 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (unscaled_point != NULL); -#line 4333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4352 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_orientation (self); -#line 4333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4352 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_orientation = _tmp0_; -#line 4335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = unscaled_orientation; -#line 4335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4354 "/home/jens/Source/shotwell/src/Photo.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp2_); -#line 4335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4354 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_dimensions (_tmp1_, &_tmp2_, &_tmp3_); -#line 4335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4354 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_dims = _tmp3_; -#line 4338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4357 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_x_offset_raw = 0; -#line 4339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4358 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_y_offset_raw = 0; -#line 4342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_get_raw_crop (self, &_tmp4_); -#line 4342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" crop_box = _tmp4_; -#line 4342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 31307 "Photo.c" +#line 31432 "Photo.c" Box _tmp6_; gint _tmp7_; Box _tmp8_; gint _tmp9_; -#line 4343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = crop_box; -#line 4343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_.left; -#line 4343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4362 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_x_offset_raw = _tmp7_; -#line 4344 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = crop_box; -#line 4344 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_.top; -#line 4344 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_y_offset_raw = _tmp9_; -#line 31324 "Photo.c" +#line 31449 "Photo.c" } -#line 4347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = unscaled_orientation; -#line 4347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = unscaled_dims; -#line 4347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = *unscaled_point; -#line 4347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" orientation_derotate_point (_tmp10_, &_tmp11_, &_tmp12_, &_tmp13_); -#line 4347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" derotated_point = _tmp13_; -#line 4351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4370 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = derotated_point.x; -#line 4351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4370 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = unscaled_x_offset_raw; -#line 4351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4370 "/home/jens/Source/shotwell/src/Photo.vala" derotated_point.x = _tmp14_ + _tmp15_; -#line 4352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4371 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = derotated_point.y; -#line 4352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4371 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = unscaled_y_offset_raw; -#line 4352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4371 "/home/jens/Source/shotwell/src/Photo.vala" derotated_point.y = _tmp16_ + _tmp17_; -#line 4354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" *result = derotated_point; -#line 4354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 31352 "Photo.c" +#line 31477 "Photo.c" } @@ -31399,171 +31524,171 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe gint _tmp45_; GdkPoint _tmp46_; gint _tmp47_; -#line 4357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4376 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4376 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (unscaled_rect != NULL); -#line 4358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4377 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_.x = 0; -#line 4358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4377 "/home/jens/Source/shotwell/src/Photo.vala" upper_left = _tmp0_; -#line 4359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_.x = 0; -#line 4359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4378 "/home/jens/Source/shotwell/src/Photo.vala" lower_right = _tmp1_; -#line 4360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4379 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = *unscaled_rect; -#line 4360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4379 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_.x; -#line 4360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4379 "/home/jens/Source/shotwell/src/Photo.vala" upper_left.x = _tmp3_; -#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = *unscaled_rect; -#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_.y; -#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" upper_left.y = _tmp5_; -#line 4362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = upper_left; -#line 4362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_.x; -#line 4362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = *unscaled_rect; -#line 4362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_.width; -#line 4362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" lower_right.x = _tmp7_ + _tmp9_; -#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = upper_left; -#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_.y; -#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = *unscaled_rect; -#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_.height; -#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" lower_right.y = _tmp11_ + _tmp13_; -#line 4365 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4384 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = upper_left; -#line 4365 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4384 "/home/jens/Source/shotwell/src/Photo.vala" photo_unscaled_to_raw_point (self, &_tmp14_, &_tmp15_); -#line 4365 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4384 "/home/jens/Source/shotwell/src/Photo.vala" upper_left = _tmp15_; -#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4385 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = lower_right; -#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4385 "/home/jens/Source/shotwell/src/Photo.vala" photo_unscaled_to_raw_point (self, &_tmp16_, &_tmp17_); -#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4385 "/home/jens/Source/shotwell/src/Photo.vala" lower_right = _tmp17_; -#line 4368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4387 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = upper_left; -#line 4368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4387 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_.x; -#line 4368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4387 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = lower_right; -#line 4368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4387 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_.x; -#line 4368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4387 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_ > _tmp21_) { -#line 31464 "Photo.c" +#line 31589 "Photo.c" gint temp = 0; GdkPoint _tmp22_; gint _tmp23_; GdkPoint _tmp24_; gint _tmp25_; gint _tmp26_; -#line 4369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4388 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = upper_left; -#line 4369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4388 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_.x; -#line 4369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4388 "/home/jens/Source/shotwell/src/Photo.vala" temp = _tmp23_; -#line 4370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4389 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = lower_right; -#line 4370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4389 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_.x; -#line 4370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4389 "/home/jens/Source/shotwell/src/Photo.vala" upper_left.x = _tmp25_; -#line 4371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = temp; -#line 4371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4390 "/home/jens/Source/shotwell/src/Photo.vala" lower_right.x = _tmp26_; -#line 31487 "Photo.c" +#line 31612 "Photo.c" } -#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = upper_left; -#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_.y; -#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = lower_right; -#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_.y; -#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4392 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_ > _tmp30_) { -#line 31499 "Photo.c" +#line 31624 "Photo.c" gint temp = 0; GdkPoint _tmp31_; gint _tmp32_; GdkPoint _tmp33_; gint _tmp34_; gint _tmp35_; -#line 4374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4393 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = upper_left; -#line 4374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4393 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_.y; -#line 4374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4393 "/home/jens/Source/shotwell/src/Photo.vala" temp = _tmp32_; -#line 4375 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4394 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = lower_right; -#line 4375 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4394 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_.y; -#line 4375 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4394 "/home/jens/Source/shotwell/src/Photo.vala" upper_left.y = _tmp34_; -#line 4376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = temp; -#line 4376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" lower_right.y = _tmp35_; -#line 31522 "Photo.c" +#line 31647 "Photo.c" } -#line 4379 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4398 "/home/jens/Source/shotwell/src/Photo.vala" memset (&raw_rect, 0, sizeof (GdkRectangle)); -#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4399 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = upper_left; -#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4399 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_.x; -#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4399 "/home/jens/Source/shotwell/src/Photo.vala" raw_rect.x = _tmp37_; -#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4400 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = upper_left; -#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4400 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp38_.y; -#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4400 "/home/jens/Source/shotwell/src/Photo.vala" raw_rect.y = _tmp39_; -#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = lower_right; -#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_.x; -#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = upper_left; -#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp42_.x; -#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4401 "/home/jens/Source/shotwell/src/Photo.vala" raw_rect.width = _tmp41_ - _tmp43_; -#line 4383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = lower_right; -#line 4383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp44_.y; -#line 4383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = upper_left; -#line 4383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _tmp46_.y; -#line 4383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4402 "/home/jens/Source/shotwell/src/Photo.vala" raw_rect.height = _tmp45_ - _tmp47_; -#line 4385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4404 "/home/jens/Source/shotwell/src/Photo.vala" *result = raw_rect; -#line 4385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4404 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 31562 "Photo.c" +#line 31687 "Photo.c" } @@ -31574,85 +31699,85 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { GdkPixbuf* _tmp4_; PixelTransformationBundle* _tmp5_; GError * _inner_error_ = NULL; -#line 4388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4407 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 4389 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4408 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = NULL; -#line 31577 "Photo.c" +#line 31702 "Photo.c" { GdkPixbuf* _tmp0_ = NULL; Scaling _tmp1_ = {0}; GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; -#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4415 "/home/jens/Source/shotwell/src/Photo.vala" scaling_for_best_fit (360, FALSE, &_tmp1_); -#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4415 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_get_pixbuf_with_options (self, &_tmp1_, PHOTO_EXCEPTION_ALL, BACKING_FETCH_MODE_BASELINE, &_inner_error_); -#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4415 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp2_; -#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4415 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 31591 "Photo.c" - goto __catch405_g_error; +#line 31716 "Photo.c" + goto __catch417_g_error; } -#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4415 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp0_; -#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4415 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4415 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4415 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp3_; -#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4414 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 31604 "Photo.c" +#line 31729 "Photo.c" } - goto __finally405; - __catch405_g_error: + goto __finally417; + __catch417_g_error: { GError* e = NULL; -#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4414 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4414 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 4403 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4403: %s", "Photo: get_enhance_transformations: couldn't obtain pixbuf to build " "transform histogram"); -#line 4405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4422 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:4422: %s", "Photo: get_enhance_transformations: couldn't obtain pixbuf to build " "transform histogram"); +#line 4424 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 4405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4424 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 4405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4424 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 4405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4424 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31624 "Photo.c" +#line 31749 "Photo.c" } - __finally405: -#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" + __finally417: +#line 4414 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4414 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4414 "/home/jens/Source/shotwell/src/Photo.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 4395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4414 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4414 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 31637 "Photo.c" +#line 31762 "Photo.c" } -#line 4412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4431 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = pixbuf; -#line 4412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4431 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = auto_enhance_create_auto_enhance_adjustments (_tmp4_); -#line 4412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4431 "/home/jens/Source/shotwell/src/Photo.vala" transformations = _tmp5_; -#line 4420 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4439 "/home/jens/Source/shotwell/src/Photo.vala" result = transformations; -#line 4420 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4439 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 4420 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4439 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31651 "Photo.c" +#line 31776 "Photo.c" } @@ -31662,70 +31787,70 @@ gboolean photo_enhance (Photo* self) { PixelTransformationBundle* _tmp0_; PixelTransformationBundle* _tmp1_; GError * _inner_error_ = NULL; -#line 4423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 4424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4443 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_enhance_transformations (self); -#line 4424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4443 "/home/jens/Source/shotwell/src/Photo.vala" transformations = _tmp0_; -#line 4426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = transformations; -#line 4426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4445 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 4427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4446 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 4427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4446 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (transformations); -#line 4427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4446 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31677 "Photo.c" +#line 31802 "Photo.c" } { PhotoRow* _tmp2_; -#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4451 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4451 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 31685 "Photo.c" +#line 31810 "Photo.c" { PixelTransformationBundle* _tmp3_; -#line 4433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = transformations; -#line 4433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4452 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_color_adjustments (self, _tmp3_); -#line 31692 "Photo.c" +#line 31817 "Photo.c" } - __finally406: + __finally418: { PhotoRow* _tmp4_; -#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4451 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4451 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 31701 "Photo.c" +#line 31826 "Photo.c" } -#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4451 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 31705 "Photo.c" +#line 31830 "Photo.c" gboolean _tmp5_ = FALSE; -#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4451 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (transformations); -#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4451 "/home/jens/Source/shotwell/src/Photo.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 4432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4451 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4451 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 31715 "Photo.c" +#line 31840 "Photo.c" } } -#line 4440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4459 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4459 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (transformations); -#line 4440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4459 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31724 "Photo.c" +#line 31849 "Photo.c" } @@ -31738,7 +31863,7 @@ gboolean photo_get_develop_raw_photos_to_files (void) { result = _tmp0_; #line 349 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31737 "Photo.c" +#line 31862 "Photo.c" } @@ -31748,7 +31873,7 @@ void photo_set_develop_raw_photos_to_files (gboolean value) { _tmp0_ = value; #line 349 "/home/jens/Source/shotwell/src/Photo.vala" photo__develop_raw_photos_to_files = _tmp0_; -#line 31747 "Photo.c" +#line 31872 "Photo.c" } @@ -31757,7 +31882,7 @@ static void photo_real_editable_replaced (Photo* self, GFile* old_file, GFile* n g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file)); #line 358 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file)); -#line 31756 "Photo.c" +#line 31881 "Photo.c" } @@ -31776,19 +31901,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data2 = param_values->data[0].v_pointer; -#line 31775 "Photo.c" +#line 31900 "Photo.c" } else { #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data1 = param_values->data[0].v_pointer; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data2 = closure->data; -#line 31781 "Photo.c" +#line 31906 "Photo.c" } #line 161 "/home/jens/Source/shotwell/src/Photo.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 31787 "Photo.c" +#line 31912 "Photo.c" } @@ -31803,7 +31928,7 @@ static void photo_real_baseline_replaced (Photo* self) { static void photo_real_master_reimported (Photo* self, PhotoMetadata* metadata) { #line 376 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 31802 "Photo.c" +#line 31927 "Photo.c" } @@ -31822,47 +31947,47 @@ static void g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, GV data1 = closure->data; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data2 = param_values->data[0].v_pointer; -#line 31821 "Photo.c" +#line 31946 "Photo.c" } else { #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data1 = param_values->data[0].v_pointer; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" data2 = closure->data; -#line 31827 "Photo.c" +#line 31952 "Photo.c" } #line 161 "/home/jens/Source/shotwell/src/Photo.vala" callback = (GMarshalFunc_VOID__MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" callback (data1, value_get_media_metadata (param_values + 1), data2); -#line 31833 "Photo.c" +#line 31958 "Photo.c" } static void photo_real_editable_reimported (Photo* self, PhotoMetadata* metadata) { #line 380 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 31840 "Photo.c" +#line 31965 "Photo.c" } static void photo_real_baseline_reimported (Photo* self, PhotoMetadata* metadata) { #line 387 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 31847 "Photo.c" +#line 31972 "Photo.c" } static void photo_real_source_reimported (Photo* self, PhotoMetadata* metadata) { #line 394 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 31854 "Photo.c" +#line 31979 "Photo.c" } static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, gpointer self) { #line 257 "/home/jens/Source/shotwell/src/Photo.vala" photo_photo_transformation_state_impl_on_photo_baseline_replaced ((PhotoPhotoTransformationStateImpl*) self); -#line 31861 "Photo.c" +#line 31986 "Photo.c" } @@ -31930,14 +32055,14 @@ static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_ g_signal_connect_object (_tmp9_, "baseline-replaced", (GCallback) _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced, self, 0); #line 244 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 31929 "Photo.c" +#line 32054 "Photo.c" } static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_new (Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments) { #line 244 "/home/jens/Source/shotwell/src/Photo.vala" return photo_photo_transformation_state_impl_construct (PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL, photo, orientation, transformations, transformer, adjustments); -#line 31936 "Photo.c" +#line 32061 "Photo.c" } @@ -31952,7 +32077,7 @@ static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoP result = _tmp0_; #line 261 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31951 "Photo.c" +#line 32076 "Photo.c" } @@ -31970,7 +32095,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (Ph result = _tmp1_; #line 265 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31969 "Photo.c" +#line 32094 "Photo.c" } @@ -31984,7 +32109,7 @@ static PixelTransformer* photo_photo_transformation_state_impl_get_transformer ( _tmp1_ = self->priv->transformer; #line 269 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 31983 "Photo.c" +#line 32108 "Photo.c" PixelTransformer* _tmp2_; PixelTransformer* _tmp3_; #line 269 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31995,19 +32120,19 @@ static PixelTransformer* photo_photo_transformation_state_impl_get_transformer ( _pixel_transformer_unref0 (_tmp0_); #line 269 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 31994 "Photo.c" +#line 32119 "Photo.c" } else { #line 269 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp0_); #line 269 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 32000 "Photo.c" +#line 32125 "Photo.c" } #line 269 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 269 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32006 "Photo.c" +#line 32131 "Photo.c" } @@ -32021,7 +32146,7 @@ static PixelTransformationBundle* photo_photo_transformation_state_impl_get_colo _tmp1_ = self->priv->adjustments; #line 273 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 32020 "Photo.c" +#line 32145 "Photo.c" PixelTransformationBundle* _tmp2_; PixelTransformationBundle* _tmp3_; #line 273 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32032,19 +32157,19 @@ static PixelTransformationBundle* photo_photo_transformation_state_impl_get_colo _pixel_transformation_bundle_unref0 (_tmp0_); #line 273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 32031 "Photo.c" +#line 32156 "Photo.c" } else { #line 273 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp0_); #line 273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 32037 "Photo.c" +#line 32162 "Photo.c" } #line 273 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 273 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32043 "Photo.c" +#line 32168 "Photo.c" } @@ -32063,13 +32188,13 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G result = NULL; #line 279 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32062 "Photo.c" +#line 32187 "Photo.c" } #line 281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 281 "/home/jens/Source/shotwell/src/Photo.vala" clone = _tmp1_; -#line 32068 "Photo.c" +#line 32193 "Photo.c" { GeeIterator* _object_it = NULL; GeeHashMap* _tmp2_; @@ -32096,7 +32221,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G _object_it = _tmp7_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 32095 "Photo.c" +#line 32220 "Photo.c" GeeIterator* _tmp8_; gboolean _tmp9_; gchar* object = NULL; @@ -32118,7 +32243,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G if (!_tmp9_) { #line 282 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 32117 "Photo.c" +#line 32242 "Photo.c" } #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _object_it; @@ -32150,17 +32275,17 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G _key_value_map_unref0 (_tmp17_); #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (object); -#line 32149 "Photo.c" +#line 32274 "Photo.c" } #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 32153 "Photo.c" +#line 32278 "Photo.c" } #line 285 "/home/jens/Source/shotwell/src/Photo.vala" result = clone; #line 285 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32159 "Photo.c" +#line 32284 "Photo.c" } @@ -32174,7 +32299,7 @@ static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (Ph if (!_tmp0_) { #line 290 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState), photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL], 0); -#line 32173 "Photo.c" +#line 32298 "Photo.c" } } @@ -32186,14 +32311,14 @@ static void photo_photo_transformation_state_impl_class_init (PhotoPhotoTransfor g_type_class_add_private (klass, sizeof (PhotoPhotoTransformationStateImplPrivate)); #line 237 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (klass)->finalize = photo_photo_transformation_state_impl_finalize; -#line 32185 "Photo.c" +#line 32310 "Photo.c" } static void photo_photo_transformation_state_impl_instance_init (PhotoPhotoTransformationStateImpl * self) { #line 237 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_GET_PRIVATE (self); -#line 32192 "Photo.c" +#line 32317 "Photo.c" } @@ -32219,7 +32344,7 @@ static void photo_photo_transformation_state_impl_finalize (GObject * obj) { _pixel_transformation_bundle_unref0 (self->priv->adjustments); #line 237 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (photo_photo_transformation_state_impl_parent_class)->finalize (obj); -#line 32218 "Photo.c" +#line 32343 "Photo.c" } @@ -32241,21 +32366,21 @@ static PhotoBackingReaders* photo_backing_readers_construct (GType object_type) self = (PhotoBackingReaders*) g_type_create_instance (object_type); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32240 "Photo.c" +#line 32365 "Photo.c" } static PhotoBackingReaders* photo_backing_readers_new (void) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return photo_backing_readers_construct (PHOTO_TYPE_BACKING_READERS); -#line 32247 "Photo.c" +#line 32372 "Photo.c" } static void photo_value_backing_readers_init (GValue* value) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32254 "Photo.c" +#line 32379 "Photo.c" } @@ -32264,7 +32389,7 @@ static void photo_value_backing_readers_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" photo_backing_readers_unref (value->data[0].v_pointer); -#line 32263 "Photo.c" +#line 32388 "Photo.c" } } @@ -32274,11 +32399,11 @@ static void photo_value_backing_readers_copy_value (const GValue* src_value, GVa if (src_value->data[0].v_pointer) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_backing_readers_ref (src_value->data[0].v_pointer); -#line 32273 "Photo.c" +#line 32398 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32277 "Photo.c" +#line 32402 "Photo.c" } } @@ -32286,37 +32411,37 @@ static void photo_value_backing_readers_copy_value (const GValue* src_value, GVa static gpointer photo_value_backing_readers_peek_pointer (const GValue* value) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32285 "Photo.c" +#line 32410 "Photo.c" } static gchar* photo_value_backing_readers_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 32292 "Photo.c" +#line 32417 "Photo.c" PhotoBackingReaders * object; object = collect_values[0].v_pointer; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32299 "Photo.c" +#line 32424 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32303 "Photo.c" +#line 32428 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_backing_readers_ref (object); -#line 32307 "Photo.c" +#line 32432 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32311 "Photo.c" +#line 32436 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32315 "Photo.c" +#line 32440 "Photo.c" } @@ -32327,25 +32452,25 @@ static gchar* photo_value_backing_readers_lcopy_value (const GValue* value, guin if (!object_p) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 32326 "Photo.c" +#line 32451 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 32332 "Photo.c" +#line 32457 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 32336 "Photo.c" +#line 32461 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_backing_readers_ref (value->data[0].v_pointer); -#line 32340 "Photo.c" +#line 32465 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32344 "Photo.c" +#line 32469 "Photo.c" } @@ -32359,7 +32484,7 @@ static GParamSpec* photo_param_spec_backing_readers (const gchar* name, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 32358 "Photo.c" +#line 32483 "Photo.c" } @@ -32368,7 +32493,7 @@ static gpointer photo_value_get_backing_readers (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS), NULL); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32367 "Photo.c" +#line 32492 "Photo.c" } @@ -32388,17 +32513,17 @@ static void photo_value_set_backing_readers (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" photo_backing_readers_ref (value->data[0].v_pointer); -#line 32387 "Photo.c" +#line 32512 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32391 "Photo.c" +#line 32516 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" photo_backing_readers_unref (old); -#line 32397 "Photo.c" +#line 32522 "Photo.c" } } @@ -32417,17 +32542,17 @@ static void photo_value_take_backing_readers (GValue* value, gpointer v_object) g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 32416 "Photo.c" +#line 32541 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32420 "Photo.c" +#line 32545 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" photo_backing_readers_unref (old); -#line 32426 "Photo.c" +#line 32551 "Photo.c" } } @@ -32437,14 +32562,14 @@ static void photo_backing_readers_class_init (PhotoBackingReadersClass * klass) photo_backing_readers_parent_class = g_type_class_peek_parent (klass); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoBackingReadersClass *) klass)->finalize = photo_backing_readers_finalize; -#line 32436 "Photo.c" +#line 32561 "Photo.c" } static void photo_backing_readers_instance_init (PhotoBackingReaders * self) { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 32443 "Photo.c" +#line 32568 "Photo.c" } @@ -32460,7 +32585,7 @@ static void photo_backing_readers_finalize (PhotoBackingReaders * obj) { _photo_file_adapter_unref0 (self->developer); #line 297 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (self->editable); -#line 32459 "Photo.c" +#line 32584 "Photo.c" } @@ -32485,7 +32610,7 @@ static gpointer photo_backing_readers_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 32484 "Photo.c" +#line 32609 "Photo.c" } @@ -32498,7 +32623,7 @@ static void photo_backing_readers_unref (gpointer instance) { PHOTO_BACKING_READERS_GET_CLASS (self)->finalize (self); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 32497 "Photo.c" +#line 32622 "Photo.c" } } @@ -32533,21 +32658,21 @@ static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Phot self->pixbuf = _tmp3_; #line 305 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32532 "Photo.c" +#line 32657 "Photo.c" } static PhotoCachedPixbuf* photo_cached_pixbuf_new (Photo* photo, GdkPixbuf* pixbuf) { #line 305 "/home/jens/Source/shotwell/src/Photo.vala" return photo_cached_pixbuf_construct (PHOTO_TYPE_CACHED_PIXBUF, photo, pixbuf); -#line 32539 "Photo.c" +#line 32664 "Photo.c" } static void photo_value_cached_pixbuf_init (GValue* value) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32546 "Photo.c" +#line 32671 "Photo.c" } @@ -32556,7 +32681,7 @@ static void photo_value_cached_pixbuf_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" photo_cached_pixbuf_unref (value->data[0].v_pointer); -#line 32555 "Photo.c" +#line 32680 "Photo.c" } } @@ -32566,11 +32691,11 @@ static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValu if (src_value->data[0].v_pointer) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_cached_pixbuf_ref (src_value->data[0].v_pointer); -#line 32565 "Photo.c" +#line 32690 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32569 "Photo.c" +#line 32694 "Photo.c" } } @@ -32578,37 +32703,37 @@ static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValu static gpointer photo_value_cached_pixbuf_peek_pointer (const GValue* value) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32577 "Photo.c" +#line 32702 "Photo.c" } static gchar* photo_value_cached_pixbuf_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 32584 "Photo.c" +#line 32709 "Photo.c" PhotoCachedPixbuf * object; object = collect_values[0].v_pointer; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32591 "Photo.c" +#line 32716 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32595 "Photo.c" +#line 32720 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_cached_pixbuf_ref (object); -#line 32599 "Photo.c" +#line 32724 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32603 "Photo.c" +#line 32728 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32607 "Photo.c" +#line 32732 "Photo.c" } @@ -32619,25 +32744,25 @@ static gchar* photo_value_cached_pixbuf_lcopy_value (const GValue* value, guint if (!object_p) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 32618 "Photo.c" +#line 32743 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 32624 "Photo.c" +#line 32749 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 32628 "Photo.c" +#line 32753 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_cached_pixbuf_ref (value->data[0].v_pointer); -#line 32632 "Photo.c" +#line 32757 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32636 "Photo.c" +#line 32761 "Photo.c" } @@ -32651,7 +32776,7 @@ static GParamSpec* photo_param_spec_cached_pixbuf (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 32650 "Photo.c" +#line 32775 "Photo.c" } @@ -32660,7 +32785,7 @@ static gpointer photo_value_get_cached_pixbuf (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF), NULL); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32659 "Photo.c" +#line 32784 "Photo.c" } @@ -32680,17 +32805,17 @@ static void photo_value_set_cached_pixbuf (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" photo_cached_pixbuf_ref (value->data[0].v_pointer); -#line 32679 "Photo.c" +#line 32804 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32683 "Photo.c" +#line 32808 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" photo_cached_pixbuf_unref (old); -#line 32689 "Photo.c" +#line 32814 "Photo.c" } } @@ -32709,17 +32834,17 @@ static void photo_value_take_cached_pixbuf (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 32708 "Photo.c" +#line 32833 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32712 "Photo.c" +#line 32837 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" photo_cached_pixbuf_unref (old); -#line 32718 "Photo.c" +#line 32843 "Photo.c" } } @@ -32729,7 +32854,7 @@ static void photo_cached_pixbuf_class_init (PhotoCachedPixbufClass * klass) { photo_cached_pixbuf_parent_class = g_type_class_peek_parent (klass); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoCachedPixbufClass *) klass)->finalize = photo_cached_pixbuf_finalize; -#line 32728 "Photo.c" +#line 32853 "Photo.c" } @@ -32741,7 +32866,7 @@ static void photo_cached_pixbuf_instance_init (PhotoCachedPixbuf * self) { self->last_touched = _tmp0_; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 32740 "Photo.c" +#line 32865 "Photo.c" } @@ -32757,7 +32882,7 @@ static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf * obj) { _g_object_unref0 (self->pixbuf); #line 303 "/home/jens/Source/shotwell/src/Photo.vala" _g_timer_destroy0 (self->last_touched); -#line 32756 "Photo.c" +#line 32881 "Photo.c" } @@ -32782,7 +32907,7 @@ static gpointer photo_cached_pixbuf_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 32781 "Photo.c" +#line 32906 "Photo.c" } @@ -32795,224 +32920,224 @@ static void photo_cached_pixbuf_unref (gpointer instance) { PHOTO_CACHED_PIXBUF_GET_CLASS (self)->finalize (self); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 32794 "Photo.c" +#line 32919 "Photo.c" } } PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_type) { PhotoReimportMasterState* self = NULL; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportMasterState*) g_type_create_instance (object_type); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32805 "Photo.c" +#line 32930 "Photo.c" } static void photo_value_reimport_master_state_init (GValue* value) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32812 "Photo.c" +#line 32937 "Photo.c" } static void photo_value_reimport_master_state_free_value (GValue* value) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (value->data[0].v_pointer); -#line 32821 "Photo.c" +#line 32946 "Photo.c" } } static void photo_value_reimport_master_state_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_master_state_ref (src_value->data[0].v_pointer); -#line 32831 "Photo.c" +#line 32956 "Photo.c" } else { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32835 "Photo.c" +#line 32960 "Photo.c" } } static gpointer photo_value_reimport_master_state_peek_pointer (const GValue* value) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32843 "Photo.c" +#line 32968 "Photo.c" } static gchar* photo_value_reimport_master_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 32850 "Photo.c" +#line 32975 "Photo.c" PhotoReimportMasterState * object; object = collect_values[0].v_pointer; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32857 "Photo.c" +#line 32982 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32861 "Photo.c" +#line 32986 "Photo.c" } -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_master_state_ref (object); -#line 32865 "Photo.c" +#line 32990 "Photo.c" } else { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32869 "Photo.c" +#line 32994 "Photo.c" } -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32873 "Photo.c" +#line 32998 "Photo.c" } static gchar* photo_value_reimport_master_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { PhotoReimportMasterState ** object_p; object_p = collect_values[0].v_pointer; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 32884 "Photo.c" +#line 33009 "Photo.c" } -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 32890 "Photo.c" +#line 33015 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 32894 "Photo.c" +#line 33019 "Photo.c" } else { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_master_state_ref (value->data[0].v_pointer); -#line 32898 "Photo.c" +#line 33023 "Photo.c" } -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32902 "Photo.c" +#line 33027 "Photo.c" } GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { PhotoParamSpecReimportMasterState* spec; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 32916 "Photo.c" +#line 33041 "Photo.c" } gpointer photo_value_get_reimport_master_state (const GValue* value) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32925 "Photo.c" +#line 33050 "Photo.c" } void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) { PhotoReimportMasterState * old; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE)); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_MASTER_STATE)); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_ref (value->data[0].v_pointer); -#line 32945 "Photo.c" +#line 33070 "Photo.c" } else { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32949 "Photo.c" +#line 33074 "Photo.c" } -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (old); -#line 32955 "Photo.c" +#line 33080 "Photo.c" } } void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) { PhotoReimportMasterState * old; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE)); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_MASTER_STATE)); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 32974 "Photo.c" +#line 33099 "Photo.c" } else { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32978 "Photo.c" +#line 33103 "Photo.c" } -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (old); -#line 32984 "Photo.c" +#line 33109 "Photo.c" } } static void photo_reimport_master_state_class_init (PhotoReimportMasterStateClass * klass) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_parent_class = g_type_class_peek_parent (klass); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_finalize; -#line 32994 "Photo.c" +#line 33119 "Photo.c" } static void photo_reimport_master_state_instance_init (PhotoReimportMasterState * self) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33001 "Photo.c" +#line 33126 "Photo.c" } static void photo_reimport_master_state_finalize (PhotoReimportMasterState * obj) { PhotoReimportMasterState * self; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 33011 "Photo.c" +#line 33136 "Photo.c" } @@ -33033,46 +33158,46 @@ GType photo_reimport_master_state_get_type (void) { gpointer photo_reimport_master_state_ref (gpointer instance) { PhotoReimportMasterState * self; self = instance; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 33036 "Photo.c" +#line 33161 "Photo.c" } void photo_reimport_master_state_unref (gpointer instance) { PhotoReimportMasterState * self; self = instance; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_MASTER_STATE_GET_CLASS (self)->finalize (self); -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 33049 "Photo.c" +#line 33174 "Photo.c" } } -static gchar** _vala_array_dup28 (gchar** self, int length) { +static gchar** _vala_array_dup24 (gchar** self, int length) { gchar** result; int i; -#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" result = g_new0 (gchar*, length + 1); -#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" for (i = 0; i < length; i++) { -#line 33061 "Photo.c" +#line 33186 "Photo.c" gchar* _tmp0_; -#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = g_strdup (self[i]); -#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" result[i] = _tmp0_; -#line 33067 "Photo.c" +#line 33192 "Photo.c" } -#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 33071 "Photo.c" +#line 33196 "Photo.c" } @@ -33086,91 +33211,91 @@ static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct gint _tmp4__length1; gchar** _tmp5_; gint _tmp5__length1; -#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_ROW (row), NULL); -#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL); -#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportMasterStateImpl*) photo_reimport_master_state_construct (object_type); -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1379 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = row; -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1379 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _photo_row_ref0 (_tmp0_); -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1379 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (self->row); -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1379 "/home/jens/Source/shotwell/src/Photo.vala" self->row = _tmp1_; -#line 1361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 1361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _media_metadata_ref0 (_tmp2_); -#line 1361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 1361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata = _tmp3_; -#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = alterations; -#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4__length1 = alterations_length1; -#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup28 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_); -#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup24 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_); +#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5__length1 = _tmp4__length1; -#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL); -#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" self->alterations = _tmp5_; -#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" self->alterations_length1 = _tmp5__length1; -#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" self->_alterations_size_ = self->alterations_length1; -#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33125 "Photo.c" +#line 33250 "Photo.c" } static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) { -#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_master_state_impl_construct (PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, row, metadata, alterations, alterations_length1); -#line 33132 "Photo.c" +#line 33257 "Photo.c" } static void photo_reimport_master_state_impl_class_init (PhotoReimportMasterStateImplClass * klass) { -#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1372 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_impl_parent_class = g_type_class_peek_parent (klass); -#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1372 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_impl_finalize; -#line 33141 "Photo.c" +#line 33266 "Photo.c" } static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterStateImpl * self) { PhotoRow* _tmp0_; -#line 1354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_row_new (); -#line 1354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1373 "/home/jens/Source/shotwell/src/Photo.vala" self->row = _tmp0_; -#line 1357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1376 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 33153 "Photo.c" +#line 33278 "Photo.c" } static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj) { PhotoReimportMasterStateImpl * self; -#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1372 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl); -#line 1354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1373 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (self->row); -#line 1355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 1356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1375 "/home/jens/Source/shotwell/src/Photo.vala" self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL); -#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1372 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_MASTER_STATE_CLASS (photo_reimport_master_state_impl_parent_class)->finalize (obj); -#line 33169 "Photo.c" +#line 33294 "Photo.c" } @@ -33188,217 +33313,217 @@ static GType photo_reimport_master_state_impl_get_type (void) { PhotoReimportEditableState* photo_reimport_editable_state_construct (GType object_type) { PhotoReimportEditableState* self = NULL; -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportEditableState*) g_type_create_instance (object_type); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33191 "Photo.c" +#line 33316 "Photo.c" } static void photo_value_reimport_editable_state_init (GValue* value) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33198 "Photo.c" +#line 33323 "Photo.c" } static void photo_value_reimport_editable_state_free_value (GValue* value) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (value->data[0].v_pointer); -#line 33207 "Photo.c" +#line 33332 "Photo.c" } } static void photo_value_reimport_editable_state_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_editable_state_ref (src_value->data[0].v_pointer); -#line 33217 "Photo.c" +#line 33342 "Photo.c" } else { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 33221 "Photo.c" +#line 33346 "Photo.c" } } static gpointer photo_value_reimport_editable_state_peek_pointer (const GValue* value) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33229 "Photo.c" +#line 33354 "Photo.c" } static gchar* photo_value_reimport_editable_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 33236 "Photo.c" +#line 33361 "Photo.c" PhotoReimportEditableState * object; object = collect_values[0].v_pointer; -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33243 "Photo.c" +#line 33368 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33247 "Photo.c" +#line 33372 "Photo.c" } -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_editable_state_ref (object); -#line 33251 "Photo.c" +#line 33376 "Photo.c" } else { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33255 "Photo.c" +#line 33380 "Photo.c" } -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33259 "Photo.c" +#line 33384 "Photo.c" } static gchar* photo_value_reimport_editable_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { PhotoReimportEditableState ** object_p; object_p = collect_values[0].v_pointer; -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33270 "Photo.c" +#line 33395 "Photo.c" } -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33276 "Photo.c" +#line 33401 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33280 "Photo.c" +#line 33405 "Photo.c" } else { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_editable_state_ref (value->data[0].v_pointer); -#line 33284 "Photo.c" +#line 33409 "Photo.c" } -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33288 "Photo.c" +#line 33413 "Photo.c" } GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { PhotoParamSpecReimportEditableState* spec; -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33302 "Photo.c" +#line 33427 "Photo.c" } gpointer photo_value_get_reimport_editable_state (const GValue* value) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33311 "Photo.c" +#line 33436 "Photo.c" } void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object) { PhotoReimportEditableState * old; -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE)); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_EDITABLE_STATE)); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_ref (value->data[0].v_pointer); -#line 33331 "Photo.c" +#line 33456 "Photo.c" } else { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33335 "Photo.c" +#line 33460 "Photo.c" } -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (old); -#line 33341 "Photo.c" +#line 33466 "Photo.c" } } void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object) { PhotoReimportEditableState * old; -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE)); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_EDITABLE_STATE)); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33360 "Photo.c" +#line 33485 "Photo.c" } else { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33364 "Photo.c" +#line 33489 "Photo.c" } -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (old); -#line 33370 "Photo.c" +#line 33495 "Photo.c" } } static void photo_reimport_editable_state_class_init (PhotoReimportEditableStateClass * klass) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_parent_class = g_type_class_peek_parent (klass); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_finalize; -#line 33380 "Photo.c" +#line 33505 "Photo.c" } static void photo_reimport_editable_state_instance_init (PhotoReimportEditableState * self) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33387 "Photo.c" +#line 33512 "Photo.c" } static void photo_reimport_editable_state_finalize (PhotoReimportEditableState * obj) { PhotoReimportEditableState * self; -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 33397 "Photo.c" +#line 33522 "Photo.c" } @@ -33419,24 +33544,24 @@ GType photo_reimport_editable_state_get_type (void) { gpointer photo_reimport_editable_state_ref (gpointer instance) { PhotoReimportEditableState * self; self = instance; -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 33422 "Photo.c" +#line 33547 "Photo.c" } void photo_reimport_editable_state_unref (gpointer instance) { PhotoReimportEditableState * self; self = instance; -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_EDITABLE_STATE_GET_CLASS (self)->finalize (self); -#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 33435 "Photo.c" +#line 33560 "Photo.c" } } @@ -33447,73 +33572,73 @@ static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_constr BackingPhotoRow* _tmp1_; PhotoMetadata* _tmp2_; PhotoMetadata* _tmp3_; -#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1393 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing_state), NULL); -#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1393 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL); -#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1393 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportEditableStateImpl*) photo_reimport_editable_state_construct (object_type); -#line 1375 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1394 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing_state; -#line 1375 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1394 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _backing_photo_row_ref0 (_tmp0_); -#line 1375 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1394 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_state); -#line 1375 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1394 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_state = _tmp1_; -#line 1376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1395 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 1376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1395 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _media_metadata_ref0 (_tmp2_); -#line 1376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1395 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 1376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1395 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata = _tmp3_; -#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1393 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33470 "Photo.c" +#line 33595 "Photo.c" } static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata) { -#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1393 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_editable_state_impl_construct (PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, backing_state, metadata); -#line 33477 "Photo.c" +#line 33602 "Photo.c" } static void photo_reimport_editable_state_impl_class_init (PhotoReimportEditableStateImplClass * klass) { -#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_impl_parent_class = g_type_class_peek_parent (klass); -#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_impl_finalize; -#line 33486 "Photo.c" +#line 33611 "Photo.c" } static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEditableStateImpl * self) { BackingPhotoRow* _tmp0_; -#line 1370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1389 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing_photo_row_new (); -#line 1370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1389 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_state = _tmp0_; -#line 1372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1391 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 33498 "Photo.c" +#line 33623 "Photo.c" } static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState * obj) { PhotoReimportEditableStateImpl * self; -#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl); -#line 1370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1389 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_state); -#line 1371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1390 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_EDITABLE_STATE_CLASS (photo_reimport_editable_state_impl_parent_class)->finalize (obj); -#line 33512 "Photo.c" +#line 33637 "Photo.c" } @@ -33531,217 +33656,217 @@ static GType photo_reimport_editable_state_impl_get_type (void) { PhotoReimportRawDevelopmentState* photo_reimport_raw_development_state_construct (GType object_type) { PhotoReimportRawDevelopmentState* self = NULL; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportRawDevelopmentState*) g_type_create_instance (object_type); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33534 "Photo.c" +#line 33659 "Photo.c" } static void photo_value_reimport_raw_development_state_init (GValue* value) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33541 "Photo.c" +#line 33666 "Photo.c" } static void photo_value_reimport_raw_development_state_free_value (GValue* value) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (value->data[0].v_pointer); -#line 33550 "Photo.c" +#line 33675 "Photo.c" } } static void photo_value_reimport_raw_development_state_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_raw_development_state_ref (src_value->data[0].v_pointer); -#line 33560 "Photo.c" +#line 33685 "Photo.c" } else { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 33564 "Photo.c" +#line 33689 "Photo.c" } } static gpointer photo_value_reimport_raw_development_state_peek_pointer (const GValue* value) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33572 "Photo.c" +#line 33697 "Photo.c" } static gchar* photo_value_reimport_raw_development_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 33579 "Photo.c" +#line 33704 "Photo.c" PhotoReimportRawDevelopmentState * object; object = collect_values[0].v_pointer; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33586 "Photo.c" +#line 33711 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33590 "Photo.c" +#line 33715 "Photo.c" } -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_raw_development_state_ref (object); -#line 33594 "Photo.c" +#line 33719 "Photo.c" } else { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33598 "Photo.c" +#line 33723 "Photo.c" } -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33602 "Photo.c" +#line 33727 "Photo.c" } static gchar* photo_value_reimport_raw_development_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { PhotoReimportRawDevelopmentState ** object_p; object_p = collect_values[0].v_pointer; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33613 "Photo.c" +#line 33738 "Photo.c" } -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33619 "Photo.c" +#line 33744 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33623 "Photo.c" +#line 33748 "Photo.c" } else { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_raw_development_state_ref (value->data[0].v_pointer); -#line 33627 "Photo.c" +#line 33752 "Photo.c" } -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33631 "Photo.c" +#line 33756 "Photo.c" } GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { PhotoParamSpecReimportRawDevelopmentState* spec; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33645 "Photo.c" +#line 33770 "Photo.c" } gpointer photo_value_get_reimport_raw_development_state (const GValue* value) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33654 "Photo.c" +#line 33779 "Photo.c" } void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_object) { PhotoReimportRawDevelopmentState * old; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE)); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE)); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_ref (value->data[0].v_pointer); -#line 33674 "Photo.c" +#line 33799 "Photo.c" } else { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33678 "Photo.c" +#line 33803 "Photo.c" } -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (old); -#line 33684 "Photo.c" +#line 33809 "Photo.c" } } void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object) { PhotoReimportRawDevelopmentState * old; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE)); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE)); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33703 "Photo.c" +#line 33828 "Photo.c" } else { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33707 "Photo.c" +#line 33832 "Photo.c" } -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (old); -#line 33713 "Photo.c" +#line 33838 "Photo.c" } } static void photo_reimport_raw_development_state_class_init (PhotoReimportRawDevelopmentStateClass * klass) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_parent_class = g_type_class_peek_parent (klass); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_finalize; -#line 33723 "Photo.c" +#line 33848 "Photo.c" } static void photo_reimport_raw_development_state_instance_init (PhotoReimportRawDevelopmentState * self) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33730 "Photo.c" +#line 33855 "Photo.c" } static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState * obj) { PhotoReimportRawDevelopmentState * self; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 33740 "Photo.c" +#line 33865 "Photo.c" } @@ -33762,42 +33887,42 @@ GType photo_reimport_raw_development_state_get_type (void) { gpointer photo_reimport_raw_development_state_ref (gpointer instance) { PhotoReimportRawDevelopmentState * self; self = instance; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 33765 "Photo.c" +#line 33890 "Photo.c" } void photo_reimport_raw_development_state_unref (gpointer instance) { PhotoReimportRawDevelopmentState * self; self = instance; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_GET_CLASS (self)->finalize (self); -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 33778 "Photo.c" +#line 33903 "Photo.c" } } static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_construct (GType object_type) { PhotoReimportRawDevelopmentStateImpl* self = NULL; -#line 1397 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1416 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportRawDevelopmentStateImpl*) photo_reimport_raw_development_state_construct (object_type); -#line 1397 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1416 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33789 "Photo.c" +#line 33914 "Photo.c" } static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void) { -#line 1397 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1416 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_raw_development_state_impl_construct (PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL); -#line 33796 "Photo.c" +#line 33921 "Photo.c" } @@ -33807,27 +33932,27 @@ static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevel PhotoMetadata* _tmp2_; PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp3_; PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp4_; -#line 1400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self)); -#line 1400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_BACKING_PHOTO_ROW (backing)); -#line 1400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->list; -#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = backing; -#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_reimport_raw_development_state_impl_dev_to_reimport_new (_tmp1_, _tmp2_); -#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" gee_collection_add (_tmp0_, _tmp4_); -#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (_tmp4_); -#line 33826 "Photo.c" +#line 33951 "Photo.c" } @@ -33836,19 +33961,19 @@ static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRaw GeeCollection* _tmp0_; gint _tmp1_; gint _tmp2_; -#line 1404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1423 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self), 0); -#line 1405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1424 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->list; -#line 1405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1424 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_collection_get_size (_tmp0_); -#line 1405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1424 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 1405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1424 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 1405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1424 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 33847 "Photo.c" +#line 33972 "Photo.c" } @@ -33858,253 +33983,253 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev BackingPhotoRow* _tmp1_; PhotoMetadata* _tmp2_; PhotoMetadata* _tmp3_; -#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1407 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing), NULL); -#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1407 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL); -#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1407 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportRawDevelopmentStateImplDevToReimport*) g_type_create_instance (object_type); -#line 1389 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1408 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing; -#line 1389 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1408 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _backing_photo_row_ref0 (_tmp0_); -#line 1389 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1408 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing); -#line 1389 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1408 "/home/jens/Source/shotwell/src/Photo.vala" self->backing = _tmp1_; -#line 1390 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1409 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 1390 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1409 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _media_metadata_ref0 (_tmp2_); -#line 1390 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1409 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 1390 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1409 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata = _tmp3_; -#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1407 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33881 "Photo.c" +#line 34006 "Photo.c" } static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, PhotoMetadata* metadata) { -#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1407 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_raw_development_state_impl_dev_to_reimport_construct (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, backing, metadata); -#line 33888 "Photo.c" +#line 34013 "Photo.c" } static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_init (GValue* value) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33895 "Photo.c" +#line 34020 "Photo.c" } static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_free_value (GValue* value) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (value->data[0].v_pointer); -#line 33904 "Photo.c" +#line 34029 "Photo.c" } } static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (src_value->data[0].v_pointer); -#line 33914 "Photo.c" +#line 34039 "Photo.c" } else { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 33918 "Photo.c" +#line 34043 "Photo.c" } } static gpointer photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer (const GValue* value) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33926 "Photo.c" +#line 34051 "Photo.c" } static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 33933 "Photo.c" +#line 34058 "Photo.c" PhotoReimportRawDevelopmentStateImplDevToReimport * object; object = collect_values[0].v_pointer; -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33940 "Photo.c" +#line 34065 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33944 "Photo.c" +#line 34069 "Photo.c" } -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (object); -#line 33948 "Photo.c" +#line 34073 "Photo.c" } else { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33952 "Photo.c" +#line 34077 "Photo.c" } -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33956 "Photo.c" +#line 34081 "Photo.c" } static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { PhotoReimportRawDevelopmentStateImplDevToReimport ** object_p; object_p = collect_values[0].v_pointer; -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33967 "Photo.c" +#line 34092 "Photo.c" } -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33973 "Photo.c" +#line 34098 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33977 "Photo.c" +#line 34102 "Photo.c" } else { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer); -#line 33981 "Photo.c" +#line 34106 "Photo.c" } -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33985 "Photo.c" +#line 34110 "Photo.c" } static GParamSpec* photo_reimport_raw_development_state_impl_param_spec_dev_to_reimport (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { PhotoReimportRawDevelopmentStateImplParamSpecDevToReimport* spec; -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33999 "Photo.c" +#line 34124 "Photo.c" } static gpointer photo_reimport_raw_development_state_impl_value_get_dev_to_reimport (const GValue* value) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 34008 "Photo.c" +#line 34133 "Photo.c" } static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, gpointer v_object) { PhotoReimportRawDevelopmentStateImplDevToReimport * old; -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT)); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT)); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer); -#line 34028 "Photo.c" +#line 34153 "Photo.c" } else { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 34032 "Photo.c" +#line 34157 "Photo.c" } -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old); -#line 34038 "Photo.c" +#line 34163 "Photo.c" } } static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, gpointer v_object) { PhotoReimportRawDevelopmentStateImplDevToReimport * old; -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT)); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT)); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 34057 "Photo.c" +#line 34182 "Photo.c" } else { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 34061 "Photo.c" +#line 34186 "Photo.c" } -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old); -#line 34067 "Photo.c" +#line 34192 "Photo.c" } } static void photo_reimport_raw_development_state_impl_dev_to_reimport_class_init (PhotoReimportRawDevelopmentStateImplDevToReimportClass * klass) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_parent_class = g_type_class_peek_parent (klass); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateImplDevToReimportClass *) klass)->finalize = photo_reimport_raw_development_state_impl_dev_to_reimport_finalize; -#line 34077 "Photo.c" +#line 34202 "Photo.c" } static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_init (PhotoReimportRawDevelopmentStateImplDevToReimport * self) { BackingPhotoRow* _tmp0_; -#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1404 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing_photo_row_new (); -#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1404 "/home/jens/Source/shotwell/src/Photo.vala" self->backing = _tmp0_; -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 34089 "Photo.c" +#line 34214 "Photo.c" } static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport * obj) { PhotoReimportRawDevelopmentStateImplDevToReimport * self; -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, PhotoReimportRawDevelopmentStateImplDevToReimport); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1404 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing); -#line 1386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1405 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 34103 "Photo.c" +#line 34228 "Photo.c" } @@ -34125,58 +34250,58 @@ GType photo_reimport_raw_development_state_impl_dev_to_reimport_get_type (void) static gpointer photo_reimport_raw_development_state_impl_dev_to_reimport_ref (gpointer instance) { PhotoReimportRawDevelopmentStateImplDevToReimport * self; self = instance; -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 34128 "Photo.c" +#line 34253 "Photo.c" } static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpointer instance) { PhotoReimportRawDevelopmentStateImplDevToReimport * self; self = instance; -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_GET_CLASS (self)->finalize (self); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 34141 "Photo.c" +#line 34266 "Photo.c" } } static void photo_reimport_raw_development_state_impl_class_init (PhotoReimportRawDevelopmentStateImplClass * klass) { -#line 1383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1402 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_parent_class = g_type_class_peek_parent (klass); -#line 1383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1402 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_impl_finalize; -#line 34151 "Photo.c" +#line 34276 "Photo.c" } static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimportRawDevelopmentStateImpl * self) { GeeArrayList* _tmp0_; -#line 1394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1413 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = gee_array_list_new (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, (GBoxedCopyFunc) photo_reimport_raw_development_state_impl_dev_to_reimport_ref, (GDestroyNotify) photo_reimport_raw_development_state_impl_dev_to_reimport_unref, NULL, NULL, NULL); -#line 1394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1413 "/home/jens/Source/shotwell/src/Photo.vala" self->list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1414 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 34163 "Photo.c" +#line 34288 "Photo.c" } static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState * obj) { PhotoReimportRawDevelopmentStateImpl * self; -#line 1383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1402 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl); -#line 1394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1413 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->list); -#line 1383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1402 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_CLASS (photo_reimport_raw_development_state_impl_parent_class)->finalize (obj); -#line 34175 "Photo.c" +#line 34300 "Photo.c" } @@ -34319,7 +34444,7 @@ static void photo_class_init (PhotoClass * klass) { photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL] = g_signal_new ("source-reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA); #line 326 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_init (&__lock_photo_source_pixbuf_cache); -#line 34318 "Photo.c" +#line 34443 "Photo.c" } @@ -34330,7 +34455,7 @@ static void photo_dateable_interface_init (DateableIface * iface) { iface->get_exposure_time = (time_t (*) (Dateable *)) photo_real_get_exposure_time; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" iface->set_exposure_time = (void (*) (Dateable *, time_t)) photo_real_set_exposure_time; -#line 34329 "Photo.c" +#line 34454 "Photo.c" } @@ -34373,7 +34498,7 @@ static void photo_instance_init (Photo * self) { self->priv->developments = NULL; #line 353 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = NULL; -#line 34372 "Photo.c" +#line 34497 "Photo.c" } @@ -34413,7 +34538,7 @@ static void photo_finalize (GObject * obj) { _backing_photo_row_unref0 (self->backing_photo_row); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (photo_parent_class)->finalize (obj); -#line 34412 "Photo.c" +#line 34537 "Photo.c" } @@ -34436,13 +34561,13 @@ static void _vala_photo_get_property (GObject * object, guint property_id, GValu self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" switch (property_id) { -#line 34435 "Photo.c" +#line 34560 "Photo.c" default: #line 161 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34441 "Photo.c" +#line 34566 "Photo.c" } } @@ -34452,13 +34577,13 @@ static void _vala_photo_set_property (GObject * object, guint property_id, const self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" switch (property_id) { -#line 34451 "Photo.c" +#line 34576 "Photo.c" default: #line 161 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34457 "Photo.c" +#line 34582 "Photo.c" } } @@ -34478,71 +34603,71 @@ GType library_photo_source_collection_state_get_type (void) { static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { guint result; result = file_hash ((GFile*) v); -#line 4464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4483 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34479 "Photo.c" +#line 34604 "Photo.c" } static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { gboolean result; result = file_equal ((GFile*) a, (GFile*) b); -#line 4464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4483 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34488 "Photo.c" +#line 34613 "Photo.c" } static gint _int64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { gint result; result = int64_compare ((gint64*) a, (gint64*) b); -#line 4468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4487 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34497 "Photo.c" +#line 34622 "Photo.c" } static gint64* _int64_dup (gint64* self) { gint64* dup; -#line 4468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4487 "/home/jens/Source/shotwell/src/Photo.vala" dup = g_new0 (gint64, 1); -#line 4468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4487 "/home/jens/Source/shotwell/src/Photo.vala" memcpy (dup, self, sizeof (gint64)); -#line 4468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4487 "/home/jens/Source/shotwell/src/Photo.vala" return dup; -#line 34509 "Photo.c" +#line 34634 "Photo.c" } static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { gboolean result; result = int64_equal ((gint64*) a, (gint64*) b); -#line 4470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4489 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34518 "Photo.c" +#line 34643 "Photo.c" } static gint64 _photo_get_photo_key_get_source_database_key (DataSource* source, gpointer self) { gint64 result; result = photo_get_photo_key (source); -#line 4490 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4509 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34527 "Photo.c" +#line 34652 "Photo.c" } static void _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { -#line 4492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4511 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_trashcan_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed); -#line 34534 "Photo.c" +#line 34659 "Photo.c" } static void _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { -#line 4493 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4512 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_offline_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed); -#line 34541 "Photo.c" +#line 34666 "Photo.c" } @@ -34552,43 +34677,43 @@ LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType o MediaSourceHoldingTank* _tmp1_; MediaSourceHoldingTank* _tmp2_; MediaSourceHoldingTank* _tmp3_; -#line 4490 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4509 "/home/jens/Source/shotwell/src/Photo.vala" self = (LibraryPhotoSourceCollection*) media_source_collection_construct (object_type, "LibraryPhotoSourceCollection", _photo_get_photo_key_get_source_database_key, NULL); -#line 4492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4511 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4511 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4511 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered, self); -#line 4492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4511 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4493 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4512 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4493 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4512 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 4493 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4512 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered, self); -#line 4493 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4512 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp3_); -#line 4489 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4508 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 34571 "Photo.c" +#line 34696 "Photo.c" } LibraryPhotoSourceCollection* library_photo_source_collection_new (void) { -#line 4489 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4508 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_source_collection_construct (TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION); -#line 34578 "Photo.c" +#line 34703 "Photo.c" } static gboolean _library_photo_source_collection_check_if_trashed_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) { gboolean result; result = library_photo_source_collection_check_if_trashed_photo ((LibraryPhotoSourceCollection*) self, source, alteration); -#line 4497 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4516 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34587 "Photo.c" +#line 34712 "Photo.c" } @@ -34596,24 +34721,24 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_trash LibraryPhotoSourceCollection * self; MediaSourceHoldingTank* result = NULL; LibraryPhotoSourceHoldingTank* _tmp0_; -#line 4496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4515 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4497 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4516 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = library_photo_source_holding_tank_new (self, _library_photo_source_collection_check_if_trashed_photo_source_holding_tank_check_to_keep, self, _photo_get_photo_key_get_source_database_key, NULL); -#line 4497 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4516 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); -#line 4497 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4516 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34603 "Photo.c" +#line 34728 "Photo.c" } static gboolean _library_photo_source_collection_check_if_offline_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) { gboolean result; result = library_photo_source_collection_check_if_offline_photo ((LibraryPhotoSourceCollection*) self, source, alteration); -#line 4501 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4520 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34612 "Photo.c" +#line 34737 "Photo.c" } @@ -34621,15 +34746,15 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_offli LibraryPhotoSourceCollection * self; MediaSourceHoldingTank* result = NULL; LibraryPhotoSourceHoldingTank* _tmp0_; -#line 4500 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4519 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4501 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = library_photo_source_holding_tank_new (self, _library_photo_source_collection_check_if_offline_photo_source_holding_tank_check_to_keep, self, _photo_get_photo_key_get_source_database_key, NULL); -#line 4501 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4520 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); -#line 4501 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4520 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34628 "Photo.c" +#line 34753 "Photo.c" } @@ -34639,23 +34764,23 @@ static MediaMonitor* library_photo_source_collection_real_create_media_monitor ( Workers* _tmp0_; GCancellable* _tmp1_; PhotoMonitor* _tmp2_; -#line 4504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_WORKERS (workers), NULL); -#line 4504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); -#line 4505 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = workers; -#line 4505 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = cancellable; -#line 4505 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_monitor_new (_tmp0_, _tmp1_); -#line 4505 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_MONITOR, MediaMonitor); -#line 4505 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34654 "Photo.c" +#line 34779 "Photo.c" } @@ -34663,17 +34788,17 @@ static gboolean library_photo_source_collection_real_holds_type_of_source (Sourc LibraryPhotoSourceCollection * self; gboolean result = FALSE; DataSource* _tmp0_; -#line 4508 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4527 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4508 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4527 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); -#line 4509 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4528 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = source; -#line 4509 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4528 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO); -#line 4509 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4528 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34672 "Photo.c" +#line 34797 "Photo.c" } @@ -34681,15 +34806,15 @@ static gchar* library_photo_source_collection_real_get_typename (MediaSourceColl LibraryPhotoSourceCollection * self; gchar* result = NULL; gchar* _tmp0_; -#line 4512 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4513 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4532 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = g_strdup (PHOTO_TYPENAME); -#line 4513 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4532 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 4513 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4532 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34688 "Photo.c" +#line 34813 "Photo.c" } @@ -34698,33 +34823,33 @@ static gboolean library_photo_source_collection_real_is_file_recognized (MediaSo gboolean result = FALSE; GFile* _tmp0_; gboolean _tmp1_; -#line 4516 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4535 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4516 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4535 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 4517 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file; -#line 4517 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_file_format_is_file_supported (_tmp0_); -#line 4517 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 4517 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34709 "Photo.c" +#line 34834 "Photo.c" } static void _library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) { -#line 4529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_editable_replaced ((LibraryPhotoSourceCollection*) self, _sender, old_file, new_file); -#line 34716 "Photo.c" +#line 34841 "Photo.c" } static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) { -#line 4535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4554 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_raw_development_modified ((LibraryPhotoSourceCollection*) self, _sender); -#line 34723 "Photo.c" +#line 34848 "Photo.c" } @@ -34734,30 +34859,30 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo GeeIterable* _tmp75_; GeeIterable* _tmp153_; GeeIterable* _tmp154_; -#line 4520 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4520 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added)); -#line 4520 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); -#line 4522 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4541 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = added; -#line 4522 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4541 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 34743 "Photo.c" +#line 34868 "Photo.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp1_; GeeIterator* _tmp2_; -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = added; -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_iterable_iterator (_tmp1_); -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _object_it = _tmp2_; -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 34756 "Photo.c" +#line 34881 "Photo.c" GeeIterator* _tmp3_; gboolean _tmp4_; DataObject* object = NULL; @@ -34799,80 +34924,80 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo LibraryPhoto* _tmp56_; GeeCollection* _tmp57_; GeeCollection* _tmp58_; -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _object_it; -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp4_) { -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34806 "Photo.c" +#line 34931 "Photo.c" } -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _object_it; -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" object = (DataObject*) _tmp6_; -#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4543 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = object; -#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4543 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4543 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp8_; -#line 4526 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4545 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo; -#line 4526 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4545 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo)); -#line 4526 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4545 "/home/jens/Source/shotwell/src/Photo.vala" editable = _tmp10_; -#line 4527 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4546 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = editable; -#line 4527 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4546 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_ != NULL) { -#line 34830 "Photo.c" +#line 34955 "Photo.c" GeeHashMap* _tmp12_; GFile* _tmp13_; LibraryPhoto* _tmp14_; -#line 4528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4547 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->by_editable_file; -#line 4528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4547 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = editable; -#line 4528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4547 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo; -#line 4528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4547 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp14_); -#line 34842 "Photo.c" +#line 34967 "Photo.c" } -#line 4529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo; -#line 4529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self); -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo; -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo)); -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" raw_list = _tmp17_; -#line 4532 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4551 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = raw_list; -#line 4532 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4551 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_ != NULL) { -#line 34858 "Photo.c" +#line 34983 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp19_; GeeIterator* _tmp20_; -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = raw_list; -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp20_; -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 34871 "Photo.c" +#line 34996 "Photo.c" GeeIterator* _tmp21_; gboolean _tmp22_; GFile* f = NULL; @@ -34881,163 +35006,163 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo GeeHashMap* _tmp25_; GFile* _tmp26_; LibraryPhoto* _tmp27_; -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _f_it; -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = gee_iterator_next (_tmp21_); -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp22_) { -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34888 "Photo.c" +#line 35013 "Photo.c" } -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _f_it; -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = gee_iterator_get (_tmp23_); -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp24_; -#line 4534 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->priv->by_raw_development_file; -#line 4534 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = f; -#line 4534 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = photo; -#line 4534 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, _tmp27_); -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 34906 "Photo.c" +#line 35031 "Photo.c" } -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 34910 "Photo.c" +#line 35035 "Photo.c" } } -#line 4535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4554 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = photo; -#line 4535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4554 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self); -#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = photo; -#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_PHOTO, Photo)); -#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_; -#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_->filesize; -#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_; -#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4556 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp31_); -#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4556 "/home/jens/Source/shotwell/src/Photo.vala" master_filesize = _tmp33_; -#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4557 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo; -#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4557 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo)); -#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4557 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_; -#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4557 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp37_ != NULL; -#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4557 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp37_); -#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4557 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp38_) { -#line 34943 "Photo.c" +#line 35068 "Photo.c" LibraryPhoto* _tmp39_; BackingPhotoRow* _tmp40_; BackingPhotoRow* _tmp41_; gint64 _tmp42_; -#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = photo; -#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo)); -#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_; -#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_->filesize; -#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp42_; -#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4558 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp41_); -#line 34960 "Photo.c" +#line 35085 "Photo.c" } else { -#line 4540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = (gint64) -1; -#line 34964 "Photo.c" +#line 35089 "Photo.c" } -#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4557 "/home/jens/Source/shotwell/src/Photo.vala" editable_filesize = _tmp34_; -#line 4541 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4560 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = self->priv->filesize_to_photo; -#line 4541 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4560 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = master_filesize; -#line 4541 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4560 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = photo; -#line 4541 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4560 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp43_, &_tmp44_, _tmp45_); -#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = self->priv->photo_to_master_filesize; -#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = photo; -#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = master_filesize; -#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp47_, &_tmp48_); -#line 4543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4562 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = editable_filesize; -#line 4543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4562 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_ >= ((gint64) 0)) { -#line 34988 "Photo.c" +#line 35113 "Photo.c" GeeMultiMap* _tmp50_; gint64 _tmp51_; LibraryPhoto* _tmp52_; GeeHashMap* _tmp53_; LibraryPhoto* _tmp54_; gint64 _tmp55_; -#line 4544 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4563 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = self->priv->filesize_to_photo; -#line 4544 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4563 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = editable_filesize; -#line 4544 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4563 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = photo; -#line 4544 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4563 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp50_, &_tmp51_, _tmp52_); -#line 4545 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = self->priv->photo_to_editable_filesize; -#line 4545 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = photo; -#line 4545 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = editable_filesize; -#line 4545 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp54_, &_tmp55_); -#line 35011 "Photo.c" +#line 35136 "Photo.c" } -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4567 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = photo; -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4567 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PHOTO, Photo)); -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4567 "/home/jens/Source/shotwell/src/Photo.vala" raw_rows = _tmp57_; -#line 4549 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4568 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = raw_rows; -#line 4549 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4568 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp58_ != NULL) { -#line 35023 "Photo.c" +#line 35148 "Photo.c" { GeeIterator* _row_it = NULL; GeeCollection* _tmp59_; GeeIterator* _tmp60_; -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = raw_rows; -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _row_it = _tmp60_; -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35036 "Photo.c" +#line 35161 "Photo.c" GeeIterator* _tmp61_; gboolean _tmp62_; BackingPhotoRow* row = NULL; @@ -35045,29 +35170,29 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo gpointer _tmp64_; BackingPhotoRow* _tmp65_; gint64 _tmp66_; -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _row_it; -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = gee_iterator_next (_tmp61_); -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp62_) { -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35052 "Photo.c" +#line 35177 "Photo.c" } -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = _row_it; -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = gee_iterator_get (_tmp63_); -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" row = (BackingPhotoRow*) _tmp64_; -#line 4551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4570 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = row; -#line 4551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4570 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = _tmp65_->filesize; -#line 4551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4570 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp66_ >= ((gint64) 0)) { -#line 35066 "Photo.c" +#line 35191 "Photo.c" GeeMultiMap* _tmp67_; BackingPhotoRow* _tmp68_; gint64 _tmp69_; @@ -35076,72 +35201,72 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo LibraryPhoto* _tmp72_; BackingPhotoRow* _tmp73_; gint64 _tmp74_; -#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = self->priv->filesize_to_photo; -#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = row; -#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = _tmp68_->filesize; -#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = photo; -#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp67_, &_tmp69_, _tmp70_); -#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = self->priv->photo_to_raw_development_filesize; -#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = photo; -#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = row; -#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = _tmp73_->filesize; -#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4572 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp71_, _tmp72_, &_tmp74_); -#line 35095 "Photo.c" +#line 35220 "Photo.c" } -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35099 "Photo.c" +#line 35224 "Photo.c" } -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35103 "Photo.c" +#line 35228 "Photo.c" } } -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_rows); -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_list); -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable); -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 35116 "Photo.c" +#line 35241 "Photo.c" } -#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 35120 "Photo.c" +#line 35245 "Photo.c" } } -#line 4560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = removed; -#line 4560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp75_ != NULL) { -#line 35127 "Photo.c" +#line 35252 "Photo.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp76_; GeeIterator* _tmp77_; -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = removed; -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = gee_iterable_iterator (_tmp76_); -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _object_it = _tmp77_; -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35140 "Photo.c" +#line 35265 "Photo.c" GeeIterator* _tmp78_; gboolean _tmp79_; DataObject* object = NULL; @@ -35184,39 +35309,39 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo LibraryPhoto* _tmp134_; GeeCollection* _tmp135_; GeeCollection* _tmp136_; -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = _object_it; -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = gee_iterator_next (_tmp78_); -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp79_) { -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35191 "Photo.c" +#line 35316 "Photo.c" } -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = _object_it; -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = gee_iterator_get (_tmp80_); -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" object = (DataObject*) _tmp81_; -#line 4562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = object; -#line 4562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4581 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp83_; -#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4583 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = photo; -#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4583 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_PHOTO, Photo)); -#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4583 "/home/jens/Source/shotwell/src/Photo.vala" editable = _tmp85_; -#line 4565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4584 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = editable; -#line 4565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4584 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp86_ != NULL) { -#line 35215 "Photo.c" +#line 35340 "Photo.c" gboolean is_removed = FALSE; GeeHashMap* _tmp87_; LibraryPhoto* _tmp88_; @@ -35225,58 +35350,58 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo gboolean _tmp91_; gboolean _tmp92_; gboolean _tmp93_; -#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = self->priv->by_editable_file; -#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = photo; -#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_PHOTO, Photo)); -#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tmp89_; -#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp90_, NULL); -#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = _tmp91_; -#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4585 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp90_); -#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4585 "/home/jens/Source/shotwell/src/Photo.vala" is_removed = _tmp92_; -#line 4567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4586 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = is_removed; -#line 4567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4586 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp93_, "is_removed"); -#line 35244 "Photo.c" +#line 35369 "Photo.c" } -#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = photo; -#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp95_, NULL, FALSE); -#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp95_, 0, NULL, (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self); -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = photo; -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_PHOTO, Photo)); -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" raw_list = _tmp97_; -#line 4572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = raw_list; -#line 4572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4591 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp98_ != NULL) { -#line 35262 "Photo.c" +#line 35387 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp99_; GeeIterator* _tmp100_; -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = raw_list; -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp100_; -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35275 "Photo.c" +#line 35400 "Photo.c" GeeIterator* _tmp101_; gboolean _tmp102_; GFile* f = NULL; @@ -35284,158 +35409,158 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo gpointer _tmp104_; GeeHashMap* _tmp105_; GFile* _tmp106_; -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = _f_it; -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = gee_iterator_next (_tmp101_); -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp102_) { -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35291 "Photo.c" +#line 35416 "Photo.c" } -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = _f_it; -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = gee_iterator_get (_tmp103_); -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp104_; -#line 4574 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp105_ = self->priv->by_raw_development_file; -#line 4574 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = f; -#line 4574 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4593 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp106_, NULL); -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 35307 "Photo.c" +#line 35432 "Photo.c" } -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 35311 "Photo.c" +#line 35436 "Photo.c" } } -#line 4575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp107_ = photo; -#line 4575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4594 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp108_, NULL, FALSE); -#line 4575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4594 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp108_, 0, NULL, (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self); -#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4596 "/home/jens/Source/shotwell/src/Photo.vala" _tmp109_ = photo; -#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4596 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_PHOTO, Photo)); -#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4596 "/home/jens/Source/shotwell/src/Photo.vala" _tmp111_ = _tmp110_; -#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4596 "/home/jens/Source/shotwell/src/Photo.vala" _tmp112_ = _tmp111_->filesize; -#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4596 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = _tmp112_; -#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4596 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp111_); -#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4596 "/home/jens/Source/shotwell/src/Photo.vala" master_filesize = _tmp113_; -#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4597 "/home/jens/Source/shotwell/src/Photo.vala" _tmp115_ = photo; -#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4597 "/home/jens/Source/shotwell/src/Photo.vala" _tmp116_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, TYPE_PHOTO, Photo)); -#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4597 "/home/jens/Source/shotwell/src/Photo.vala" _tmp117_ = _tmp116_; -#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4597 "/home/jens/Source/shotwell/src/Photo.vala" _tmp118_ = _tmp117_ != NULL; -#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4597 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp117_); -#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4597 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp118_) { -#line 35346 "Photo.c" +#line 35471 "Photo.c" LibraryPhoto* _tmp119_; BackingPhotoRow* _tmp120_; BackingPhotoRow* _tmp121_; gint64 _tmp122_; -#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp119_ = photo; -#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp120_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_PHOTO, Photo)); -#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = _tmp120_; -#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp122_ = _tmp121_->filesize; -#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_ = _tmp122_; -#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4598 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp121_); -#line 35363 "Photo.c" +#line 35488 "Photo.c" } else { -#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_ = (gint64) -1; -#line 35367 "Photo.c" +#line 35492 "Photo.c" } -#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4597 "/home/jens/Source/shotwell/src/Photo.vala" editable_filesize = _tmp114_; -#line 4581 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4600 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = self->priv->filesize_to_photo; -#line 4581 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4600 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124_ = master_filesize; -#line 4581 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4600 "/home/jens/Source/shotwell/src/Photo.vala" _tmp125_ = photo; -#line 4581 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4600 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp123_, &_tmp124_, _tmp125_); -#line 4582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4601 "/home/jens/Source/shotwell/src/Photo.vala" _tmp126_ = self->priv->photo_to_master_filesize; -#line 4582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4601 "/home/jens/Source/shotwell/src/Photo.vala" _tmp127_ = photo; -#line 4582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4601 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp127_, NULL); -#line 4583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4602 "/home/jens/Source/shotwell/src/Photo.vala" _tmp128_ = editable_filesize; -#line 4583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4602 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp128_ >= ((gint64) 0)) { -#line 35389 "Photo.c" +#line 35514 "Photo.c" GeeMultiMap* _tmp129_; gint64 _tmp130_; LibraryPhoto* _tmp131_; GeeHashMap* _tmp132_; LibraryPhoto* _tmp133_; -#line 4584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" _tmp129_ = self->priv->filesize_to_photo; -#line 4584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" _tmp130_ = editable_filesize; -#line 4584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" _tmp131_ = photo; -#line 4584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp129_, &_tmp130_, _tmp131_); -#line 4585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4604 "/home/jens/Source/shotwell/src/Photo.vala" _tmp132_ = self->priv->photo_to_editable_filesize; -#line 4585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4604 "/home/jens/Source/shotwell/src/Photo.vala" _tmp133_ = photo; -#line 4585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4604 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp133_, NULL); -#line 35409 "Photo.c" +#line 35534 "Photo.c" } -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp134_ = photo; -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp135_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, TYPE_PHOTO, Photo)); -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4607 "/home/jens/Source/shotwell/src/Photo.vala" raw_rows = _tmp135_; -#line 4589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4608 "/home/jens/Source/shotwell/src/Photo.vala" _tmp136_ = raw_rows; -#line 4589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4608 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp136_ != NULL) { -#line 35421 "Photo.c" +#line 35546 "Photo.c" { GeeIterator* _row_it = NULL; GeeCollection* _tmp137_; GeeIterator* _tmp138_; -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp137_ = raw_rows; -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp138_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _row_it = _tmp138_; -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35434 "Photo.c" +#line 35559 "Photo.c" GeeIterator* _tmp139_; gboolean _tmp140_; BackingPhotoRow* row = NULL; @@ -35443,29 +35568,29 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo gpointer _tmp142_; BackingPhotoRow* _tmp143_; gint64 _tmp144_; -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp139_ = _row_it; -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp140_ = gee_iterator_next (_tmp139_); -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp140_) { -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35450 "Photo.c" +#line 35575 "Photo.c" } -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp141_ = _row_it; -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp142_ = gee_iterator_get (_tmp141_); -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" row = (BackingPhotoRow*) _tmp142_; -#line 4591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp143_ = row; -#line 4591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp144_ = _tmp143_->filesize; -#line 4591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4610 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp144_ >= ((gint64) 0)) { -#line 35464 "Photo.c" +#line 35589 "Photo.c" GeeMultiMap* _tmp145_; BackingPhotoRow* _tmp146_; gint64 _tmp147_; @@ -35474,116 +35599,116 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo LibraryPhoto* _tmp150_; BackingPhotoRow* _tmp151_; gint64 _tmp152_; -#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4611 "/home/jens/Source/shotwell/src/Photo.vala" _tmp145_ = self->priv->filesize_to_photo; -#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4611 "/home/jens/Source/shotwell/src/Photo.vala" _tmp146_ = row; -#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4611 "/home/jens/Source/shotwell/src/Photo.vala" _tmp147_ = _tmp146_->filesize; -#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4611 "/home/jens/Source/shotwell/src/Photo.vala" _tmp148_ = photo; -#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4611 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp145_, &_tmp147_, _tmp148_); -#line 4593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp149_ = self->priv->photo_to_raw_development_filesize; -#line 4593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp150_ = photo; -#line 4593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp151_ = row; -#line 4593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp152_ = _tmp151_->filesize; -#line 4593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4612 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp149_, _tmp150_, &_tmp152_); -#line 35493 "Photo.c" +#line 35618 "Photo.c" } -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35497 "Photo.c" +#line 35622 "Photo.c" } -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35501 "Photo.c" +#line 35626 "Photo.c" } } -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_rows); -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_list); -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable); -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 35514 "Photo.c" +#line 35639 "Photo.c" } -#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 35518 "Photo.c" +#line 35643 "Photo.c" } } -#line 4600 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" _tmp153_ = added; -#line 4600 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" _tmp154_ = removed; -#line 4600 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp153_, _tmp154_); -#line 35527 "Photo.c" +#line 35652 "Photo.c" } static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, Photo* photo, GFile* old_file, GFile* new_file) { GFile* _tmp0_; GFile* _tmp5_; -#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4622 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4622 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (photo)); -#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4622 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file)); -#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4622 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file)); -#line 4604 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4623 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = old_file; -#line 4604 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4623 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 35546 "Photo.c" +#line 35671 "Photo.c" gboolean is_removed = FALSE; GeeHashMap* _tmp1_; GFile* _tmp2_; gboolean _tmp3_; gboolean _tmp4_; -#line 4605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->by_editable_file; -#line 4605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = old_file; -#line 4605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, NULL); -#line 4605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4624 "/home/jens/Source/shotwell/src/Photo.vala" is_removed = _tmp3_; -#line 4606 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4625 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = is_removed; -#line 4606 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4625 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp4_, "is_removed"); -#line 35564 "Photo.c" +#line 35689 "Photo.c" } -#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = new_file; -#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ != NULL) { -#line 35570 "Photo.c" +#line 35695 "Photo.c" GeeHashMap* _tmp6_; GFile* _tmp7_; Photo* _tmp8_; -#line 4610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->by_editable_file; -#line 4610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = new_file; -#line 4610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo; -#line 4610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 35582 "Photo.c" +#line 35707 "Photo.c" } } @@ -35604,35 +35729,35 @@ static void library_photo_source_collection_on_raw_development_modified (Library LibraryPhoto* _tmp35_; GeeCollection* _tmp36_; GeeCollection* _tmp37_; -#line 4613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4632 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4632 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (_photo)); -#line 4614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _photo; -#line 4614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL); -#line 4614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp1_; -#line 4615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo; -#line 4615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4634 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 4616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4635 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4635 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 35621 "Photo.c" +#line 35746 "Photo.c" } -#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4638 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->photo_to_raw_development_filesize; -#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4638 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo; -#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4638 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_); -#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4638 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 35631 "Photo.c" +#line 35756 "Photo.c" GeeMultiMap* _tmp21_; LibraryPhoto* _tmp22_; { @@ -35643,25 +35768,25 @@ static void library_photo_source_collection_on_raw_development_modified (Library GeeCollection* _tmp9_; GeeIterator* _tmp10_; GeeIterator* _tmp11_; -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->photo_to_raw_development_filesize; -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo; -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_); -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp9_); -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _s_it = _tmp11_; -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35660 "Photo.c" +#line 35785 "Photo.c" GeeIterator* _tmp12_; gboolean _tmp13_; gint64 s = 0LL; @@ -35672,74 +35797,74 @@ static void library_photo_source_collection_on_raw_development_modified (Library GeeMultiMap* _tmp18_; gint64 _tmp19_; LibraryPhoto* _tmp20_; -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _s_it; -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = gee_iterator_next (_tmp12_); -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp13_) { -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35679 "Photo.c" +#line 35804 "Photo.c" } -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _s_it; -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = gee_iterator_get (_tmp14_); -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = (gint64*) _tmp15_; -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = *_tmp16_; -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp16_); -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" s = _tmp17_; -#line 4621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->priv->filesize_to_photo; -#line 4621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = s; -#line 4621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo; -#line 4621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4640 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp18_, &_tmp19_, _tmp20_); -#line 35701 "Photo.c" +#line 35826 "Photo.c" } -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_s_it); -#line 35705 "Photo.c" +#line 35830 "Photo.c" } -#line 4622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = self->priv->photo_to_raw_development_filesize; -#line 4622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = photo; -#line 4622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove_all (_tmp21_, _tmp22_); -#line 35713 "Photo.c" +#line 35838 "Photo.c" } -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4645 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo; -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4645 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo)); -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4645 "/home/jens/Source/shotwell/src/Photo.vala" raw_list = _tmp24_; -#line 4627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = raw_list; -#line 4627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp25_ != NULL) { -#line 35725 "Photo.c" +#line 35850 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp26_; GeeIterator* _tmp27_; -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = raw_list; -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp27_; -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35738 "Photo.c" +#line 35863 "Photo.c" GeeIterator* _tmp28_; gboolean _tmp29_; GFile* f = NULL; @@ -35748,63 +35873,63 @@ static void library_photo_source_collection_on_raw_development_modified (Library GeeHashMap* _tmp32_; GFile* _tmp33_; LibraryPhoto* _tmp34_; -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _f_it; -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = gee_iterator_next (_tmp28_); -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp29_) { -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35755 "Photo.c" +#line 35880 "Photo.c" } -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _f_it; -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = gee_iterator_get (_tmp30_); -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp31_; -#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = self->priv->by_raw_development_file; -#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = f; -#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = photo; -#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_); -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 35773 "Photo.c" +#line 35898 "Photo.c" } -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 35777 "Photo.c" +#line 35902 "Photo.c" } } -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo; -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo)); -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" raw_rows = _tmp36_; -#line 4632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4651 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = raw_rows; -#line 4632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4651 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp37_ != NULL) { -#line 35790 "Photo.c" +#line 35915 "Photo.c" { GeeIterator* _row_it = NULL; GeeCollection* _tmp38_; GeeIterator* _tmp39_; -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = raw_rows; -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _row_it = _tmp39_; -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35803 "Photo.c" +#line 35928 "Photo.c" GeeIterator* _tmp40_; gboolean _tmp41_; BackingPhotoRow* row = NULL; @@ -35812,29 +35937,29 @@ static void library_photo_source_collection_on_raw_development_modified (Library gpointer _tmp43_; BackingPhotoRow* _tmp44_; gint64 _tmp45_; -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = _row_it; -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = gee_iterator_next (_tmp40_); -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp41_) { -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35819 "Photo.c" +#line 35944 "Photo.c" } -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _row_it; -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = gee_iterator_get (_tmp42_); -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" row = (BackingPhotoRow*) _tmp43_; -#line 4634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = row; -#line 4634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4653 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp44_->filesize; -#line 4634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4653 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp45_ > ((gint64) 0)) { -#line 35833 "Photo.c" +#line 35958 "Photo.c" GeeMultiMap* _tmp46_; BackingPhotoRow* _tmp47_; gint64 _tmp48_; @@ -35843,62 +35968,62 @@ static void library_photo_source_collection_on_raw_development_modified (Library LibraryPhoto* _tmp51_; BackingPhotoRow* _tmp52_; gint64 _tmp53_; -#line 4635 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4654 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = self->priv->filesize_to_photo; -#line 4635 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4654 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = row; -#line 4635 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4654 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_->filesize; -#line 4635 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4654 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = photo; -#line 4635 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4654 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp46_, &_tmp48_, _tmp49_); -#line 4636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = self->priv->photo_to_raw_development_filesize; -#line 4636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = photo; -#line 4636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = row; -#line 4636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp52_->filesize; -#line 4636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp50_, _tmp51_, &_tmp53_); -#line 35862 "Photo.c" +#line 35987 "Photo.c" } -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35866 "Photo.c" +#line 35991 "Photo.c" } -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35870 "Photo.c" +#line 35995 "Photo.c" } } -#line 4613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4632 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_rows); -#line 4613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4632 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_list); -#line 4613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4632 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 35879 "Photo.c" +#line 36004 "Photo.c" } static gpointer __int64_dup0 (gpointer self) { -#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4671 "/home/jens/Source/shotwell/src/Photo.vala" return self ? _int64_dup (self) : NULL; -#line 35886 "Photo.c" +#line 36011 "Photo.c" } static void library_photo_source_collection_real_items_altered (DataCollection* base, GeeMap* items) { LibraryPhotoSourceCollection * self; GeeMap* _tmp72_; -#line 4642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_MAP (items)); -#line 35897 "Photo.c" +#line 36022 "Photo.c" { GeeIterator* _object_it = NULL; GeeMap* _tmp0_; @@ -35907,25 +36032,25 @@ static void library_photo_source_collection_real_items_altered (DataCollection* GeeSet* _tmp3_; GeeIterator* _tmp4_; GeeIterator* _tmp5_; -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = items; -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_map_get_keys (_tmp0_); -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _object_it = _tmp5_; -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35924 "Photo.c" +#line 36049 "Photo.c" GeeIterator* _tmp6_; gboolean _tmp7_; DataObject* object = NULL; @@ -35941,59 +36066,59 @@ static void library_photo_source_collection_real_items_altered (DataCollection* gboolean _tmp15_ = FALSE; Alteration* _tmp16_; gboolean _tmp17_; -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _object_it; -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp7_) { -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35948 "Photo.c" +#line 36073 "Photo.c" } -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _object_it; -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" object = (DataObject*) _tmp9_; -#line 4644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = items; -#line 4644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = object; -#line 4644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = gee_map_get (_tmp10_, _tmp11_); -#line 4644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" alteration = (Alteration*) _tmp12_; -#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4665 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = object; -#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4665 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4665 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp14_; -#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = alteration; -#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = alteration_has_detail (_tmp16_, "image", "master"); -#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_) { -#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = TRUE; -#line 35978 "Photo.c" +#line 36103 "Photo.c" } else { Alteration* _tmp18_; gboolean _tmp19_; -#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = alteration; -#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = alteration_has_detail (_tmp18_, "image", "editable"); -#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp19_; -#line 35988 "Photo.c" +#line 36113 "Photo.c" } -#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 35992 "Photo.c" +#line 36117 "Photo.c" gint64 old_master_filesize = 0LL; GeeHashMap* _tmp20_; LibraryPhoto* _tmp21_; @@ -36030,215 +36155,215 @@ static void library_photo_source_collection_real_items_altered (DataCollection* gint64 _tmp63_; LibraryPhoto* _tmp64_; gint64 _tmp65_; -#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->priv->photo_to_master_filesize; -#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo; -#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_); -#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = (gint64*) _tmp22_; -#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = *_tmp23_; -#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp23_); -#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" old_master_filesize = _tmp24_; -#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = self->priv->photo_to_editable_filesize; -#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = photo; -#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_); -#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_) { -#line 36051 "Photo.c" +#line 36176 "Photo.c" GeeHashMap* _tmp29_; LibraryPhoto* _tmp30_; gpointer _tmp31_; -#line 4651 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4670 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = self->priv->photo_to_editable_filesize; -#line 4651 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4670 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = photo; -#line 4651 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4670 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_); -#line 4651 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4670 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp25_); -#line 4651 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4670 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = (gint64*) _tmp31_; -#line 36065 "Photo.c" +#line 36190 "Photo.c" } else { gint64 _tmp32_; gint64* _tmp33_; -#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4671 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = (gint64) -1; -#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4671 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = __int64_dup0 (&_tmp32_); -#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4671 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp25_); -#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4671 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp33_; -#line 36077 "Photo.c" +#line 36202 "Photo.c" } -#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" old_editable_filesize = *_tmp25_; -#line 4654 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4673 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = self->priv->photo_to_master_filesize; -#line 4654 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4673 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo; -#line 4654 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4673 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_, NULL); -#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4674 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = self->priv->filesize_to_photo; -#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4674 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = old_master_filesize; -#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4674 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = photo; -#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4674 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp36_, &_tmp37_, _tmp38_); -#line 4656 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4675 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = old_editable_filesize; -#line 4656 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4675 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp39_ >= ((gint64) 0)) { -#line 36099 "Photo.c" +#line 36224 "Photo.c" GeeHashMap* _tmp40_; LibraryPhoto* _tmp41_; GeeMultiMap* _tmp42_; gint64 _tmp43_; LibraryPhoto* _tmp44_; -#line 4657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4676 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = self->priv->photo_to_editable_filesize; -#line 4657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4676 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = photo; -#line 4657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4676 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp41_, NULL); -#line 4658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = self->priv->filesize_to_photo; -#line 4658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = old_editable_filesize; -#line 4658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = photo; -#line 4658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4677 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp42_, &_tmp43_, _tmp44_); -#line 36119 "Photo.c" +#line 36244 "Photo.c" } -#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = photo; -#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo)); -#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _tmp46_; -#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_->filesize; -#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = _tmp48_; -#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp47_); -#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" master_filesize = _tmp49_; -#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4681 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = photo; -#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4681 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_PHOTO, Photo)); -#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4681 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp52_; -#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4681 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = _tmp53_ != NULL; -#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4681 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp53_); -#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4681 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp54_) { -#line 36147 "Photo.c" +#line 36272 "Photo.c" LibraryPhoto* _tmp55_; BackingPhotoRow* _tmp56_; BackingPhotoRow* _tmp57_; gint64 _tmp58_; -#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4682 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = photo; -#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4682 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo)); -#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4682 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = _tmp56_; -#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4682 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = _tmp57_->filesize; -#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4682 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = _tmp58_; -#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4682 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp57_); -#line 36164 "Photo.c" +#line 36289 "Photo.c" } else { -#line 4664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4683 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = (gint64) -1; -#line 36168 "Photo.c" +#line 36293 "Photo.c" } -#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4681 "/home/jens/Source/shotwell/src/Photo.vala" editable_filesize = _tmp50_; -#line 4665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4684 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = self->priv->photo_to_master_filesize; -#line 4665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4684 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = photo; -#line 4665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4684 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = master_filesize; -#line 4665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4684 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, &_tmp61_); -#line 4666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = self->priv->filesize_to_photo; -#line 4666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = master_filesize; -#line 4666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = photo; -#line 4666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4685 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp62_, &_tmp63_, _tmp64_); -#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = editable_filesize; -#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4686 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp65_ >= ((gint64) 0)) { -#line 36192 "Photo.c" +#line 36317 "Photo.c" GeeHashMap* _tmp66_; LibraryPhoto* _tmp67_; gint64 _tmp68_; GeeMultiMap* _tmp69_; gint64 _tmp70_; LibraryPhoto* _tmp71_; -#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4687 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = self->priv->photo_to_editable_filesize; -#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4687 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = photo; -#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4687 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = editable_filesize; -#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4687 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp67_, &_tmp68_); -#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4688 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = self->priv->filesize_to_photo; -#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4688 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = editable_filesize; -#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4688 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = photo; -#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4688 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp69_, &_tmp70_, _tmp71_); -#line 36215 "Photo.c" +#line 36340 "Photo.c" } -#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp25_); -#line 36219 "Photo.c" +#line 36344 "Photo.c" } -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (alteration); -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 36227 "Photo.c" +#line 36352 "Photo.c" } -#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 36231 "Photo.c" +#line 36356 "Photo.c" } -#line 4674 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4693 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = items; -#line 4674 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4693 "/home/jens/Source/shotwell/src/Photo.vala" DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp72_); -#line 36237 "Photo.c" +#line 36362 "Photo.c" } @@ -36247,28 +36372,28 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med GeeHashMultiMap* map = NULL; GeeHashMultiMap* _tmp0_; GeeCollection* _tmp97_; -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (media_sources)); -#line 4679 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 4679 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 36254 "Photo.c" +#line 36379 "Photo.c" { GeeIterator* _media_it = NULL; GeeCollection* _tmp1_; GeeIterator* _tmp2_; -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_sources; -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _media_it = _tmp2_; -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36267 "Photo.c" +#line 36392 "Photo.c" GeeIterator* _tmp3_; gboolean _tmp4_; MediaSource* media = NULL; @@ -36291,80 +36416,80 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med gboolean _tmp21_; PhotoMetadata* _tmp55_; gboolean _tmp56_; -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _media_it; -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp4_) { -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36298 "Photo.c" +#line 36423 "Photo.c" } -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _media_it; -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" media = (MediaSource*) _tmp6_; -#line 4681 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = media; -#line 4681 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4681 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp8_; -#line 4682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4701 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo; -#line 4682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4701 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource)); -#line 4682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4701 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp10_; -#line 4685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4704 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = hierarchical_tag_index_get_global_index (); -#line 4685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4704 "/home/jens/Source/shotwell/src/Photo.vala" global_index = _tmp11_; -#line 4692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4711 "/home/jens/Source/shotwell/src/Photo.vala" htag_index = NULL; -#line 4693 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = metadata; -#line 4693 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_metadata_has_hierarchical_keywords (_tmp12_); -#line 4693 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 36330 "Photo.c" +#line 36455 "Photo.c" PhotoMetadata* _tmp14_; GeeSet* _tmp15_; GeeSet* _tmp16_; HierarchicalTagIndex* _tmp17_; -#line 4694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = metadata; -#line 4694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_metadata_get_hierarchical_keywords (_tmp14_); -#line 4694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 4694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 4694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4713 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (htag_index); -#line 4694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4713 "/home/jens/Source/shotwell/src/Photo.vala" htag_index = _tmp17_; -#line 4694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4713 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp16_); -#line 36349 "Photo.c" +#line 36474 "Photo.c" } -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = photo; -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = library_photo_get_import_keywords (_tmp18_); -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_ != NULL; -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp20_); -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 36363 "Photo.c" +#line 36488 "Photo.c" { GeeIterator* _keyword_it = NULL; LibraryPhoto* _tmp22_; @@ -36372,23 +36497,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med GeeCollection* _tmp24_; GeeIterator* _tmp25_; GeeIterator* _tmp26_; -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = photo; -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = library_photo_get_import_keywords (_tmp22_); -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_; -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_; -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp24_); -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _keyword_it = _tmp26_; -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36387 "Photo.c" +#line 36512 "Photo.c" GeeIterator* _tmp27_; gboolean _tmp28_; gchar* keyword = NULL; @@ -36403,67 +36528,67 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med const gchar* _tmp39_; gboolean _tmp40_; const gchar* _tmp49_; -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _keyword_it; -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = gee_iterator_next (_tmp27_); -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp28_) { -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36410 "Photo.c" +#line 36535 "Photo.c" } -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _keyword_it; -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = gee_iterator_get (_tmp29_); -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" keyword = (gchar*) _tmp30_; -#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = htag_index; -#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp32_ != NULL) { -#line 36422 "Photo.c" +#line 36547 "Photo.c" HierarchicalTagIndex* _tmp33_; const gchar* _tmp34_; gboolean _tmp35_; -#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = htag_index; -#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = keyword; -#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = hierarchical_tag_index_is_tag_in_index (_tmp33_, _tmp34_); -#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp35_; -#line 36434 "Photo.c" +#line 36559 "Photo.c" } else { -#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = FALSE; -#line 36438 "Photo.c" +#line 36563 "Photo.c" } -#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp31_) { -#line 4701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 4701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 36446 "Photo.c" +#line 36571 "Photo.c" } -#line 4703 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4722 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = keyword; -#line 4703 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4722 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = tag_prep_tag_name (_tmp36_); -#line 4703 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4722 "/home/jens/Source/shotwell/src/Photo.vala" name = _tmp37_; -#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4724 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = global_index; -#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4724 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = name; -#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4724 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = hierarchical_tag_index_is_tag_in_index (_tmp38_, _tmp39_); -#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4724 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp40_) { -#line 36462 "Photo.c" +#line 36587 "Photo.c" gchar* most_derived_path = NULL; HierarchicalTagIndex* _tmp41_; const gchar* _tmp42_; @@ -36473,82 +36598,82 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med Tag* _tmp46_; Tag* _tmp47_; LibraryPhoto* _tmp48_; -#line 4706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = global_index; -#line 4706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = name; -#line 4706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = hierarchical_tag_index_get_path_for_name (_tmp41_, _tmp42_); -#line 4706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" most_derived_path = _tmp43_; -#line 4707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = map; -#line 4707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = most_derived_path; -#line 4707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = tag_for_path (_tmp45_); -#line 4707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _tmp46_; -#line 4707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = photo; -#line 4707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4726 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp47_, _tmp48_); -#line 4707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4726 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp47_); -#line 4708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4727 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (most_derived_path); -#line 4708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4727 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 4708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4727 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 4708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4727 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 36502 "Photo.c" +#line 36627 "Photo.c" } -#line 4711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = name; -#line 4711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_ != NULL) { -#line 36508 "Photo.c" +#line 36633 "Photo.c" GeeHashMultiMap* _tmp50_; const gchar* _tmp51_; Tag* _tmp52_; Tag* _tmp53_; LibraryPhoto* _tmp54_; -#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = map; -#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = name; -#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = tag_for_path (_tmp51_); -#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp52_; -#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = photo; -#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp53_, _tmp54_); -#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp53_); -#line 36528 "Photo.c" +#line 36653 "Photo.c" } -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 36534 "Photo.c" +#line 36659 "Photo.c" } -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_keyword_it); -#line 36538 "Photo.c" +#line 36663 "Photo.c" } } -#line 4716 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4735 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = metadata; -#line 4716 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4735 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = photo_metadata_has_hierarchical_keywords (_tmp55_); -#line 4716 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4735 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp56_) { -#line 36547 "Photo.c" +#line 36672 "Photo.c" { GeeIterator* _path_it = NULL; HierarchicalTagIndex* _tmp57_; @@ -36556,23 +36681,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med GeeCollection* _tmp59_; GeeIterator* _tmp60_; GeeIterator* _tmp61_; -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = htag_index; -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = hierarchical_tag_index_get_all_paths (_tmp57_); -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = _tmp58_; -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _tmp60_; -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp59_); -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _path_it = _tmp61_; -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36571 "Photo.c" +#line 36696 "Photo.c" GeeIterator* _tmp62_; gboolean _tmp63_; gchar* path = NULL; @@ -36582,94 +36707,94 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med const gchar* _tmp66_; gchar* _tmp67_; const gchar* _tmp68_; -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = _path_it; -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = gee_iterator_next (_tmp62_); -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp63_) { -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36589 "Photo.c" +#line 36714 "Photo.c" } -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = _path_it; -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = gee_iterator_get (_tmp64_); -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" path = (gchar*) _tmp65_; -#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4737 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = path; -#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4737 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = tag_prep_tag_name (_tmp66_); -#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4737 "/home/jens/Source/shotwell/src/Photo.vala" name = _tmp67_; -#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4738 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = name; -#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4738 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp68_ != NULL) { -#line 36607 "Photo.c" +#line 36732 "Photo.c" GeeHashMultiMap* _tmp69_; const gchar* _tmp70_; Tag* _tmp71_; Tag* _tmp72_; LibraryPhoto* _tmp73_; -#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4739 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = map; -#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4739 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = name; -#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4739 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = tag_for_path (_tmp70_); -#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4739 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = _tmp71_; -#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4739 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = photo; -#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4739 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp72_, _tmp73_); -#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4739 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp72_); -#line 36627 "Photo.c" +#line 36752 "Photo.c" } -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (path); -#line 36633 "Photo.c" +#line 36758 "Photo.c" } -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_path_it); -#line 36637 "Photo.c" +#line 36762 "Photo.c" } } -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (htag_index); -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (global_index); -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 36650 "Photo.c" +#line 36775 "Photo.c" } -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 36654 "Photo.c" +#line 36779 "Photo.c" } { GeeIterator* _media_it = NULL; GeeCollection* _tmp74_; GeeIterator* _tmp75_; -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = media_sources; -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _media_it = _tmp75_; -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36668 "Photo.c" +#line 36793 "Photo.c" GeeIterator* _tmp76_; gboolean _tmp77_; MediaSource* media = NULL; @@ -36679,41 +36804,41 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med MediaSource* _tmp80_; LibraryPhoto* _tmp81_; LibraryPhoto* _tmp82_; -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = _media_it; -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = gee_iterator_next (_tmp76_); -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp77_) { -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36686 "Photo.c" +#line 36811 "Photo.c" } -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = _media_it; -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = gee_iterator_get (_tmp78_); -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" media = (MediaSource*) _tmp79_; -#line 4726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = media; -#line 4726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4745 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp81_; -#line 4727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = photo; -#line 4727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4746 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_clear_import_keywords (_tmp82_); -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 36708 "Photo.c" +#line 36833 "Photo.c" } -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 36712 "Photo.c" +#line 36837 "Photo.c" } { GeeIterator* _tag_it = NULL; @@ -36722,23 +36847,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med GeeSet* _tmp85_; GeeIterator* _tmp86_; GeeIterator* _tmp87_; -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = map; -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = _tmp84_; -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = _tmp86_; -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp85_); -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _tag_it = _tmp87_; -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36737 "Photo.c" +#line 36862 "Photo.c" GeeIterator* _tmp88_; gboolean _tmp89_; Tag* tag = NULL; @@ -36749,155 +36874,155 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med Tag* _tmp94_; GeeCollection* _tmp95_; GeeCollection* _tmp96_; -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = _tag_it; -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = gee_iterator_next (_tmp88_); -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp89_) { -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36756 "Photo.c" +#line 36881 "Photo.c" } -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tag_it; -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = gee_iterator_get (_tmp90_); -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" tag = (Tag*) _tmp91_; -#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4750 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = tag; -#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4750 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = map; -#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4750 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = tag; -#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4750 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp94_); -#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4750 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = _tmp95_; -#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4750 "/home/jens/Source/shotwell/src/Photo.vala" tag_attach_many (_tmp92_, _tmp96_); -#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4750 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp96_); -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 36780 "Photo.c" +#line 36905 "Photo.c" } -#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_it); -#line 36784 "Photo.c" +#line 36909 "Photo.c" } -#line 4733 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4752 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = media_sources; -#line 4733 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4752 "/home/jens/Source/shotwell/src/Photo.vala" MEDIA_SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->postprocess_imported_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp97_); -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map); -#line 36792 "Photo.c" +#line 36917 "Photo.c" } static void library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { LibraryPhoto* _tmp0_; PhotoMetadata* _tmp1_; -#line 4737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4756 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4756 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 4738 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo; -#line 4738 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = metadata; -#line 4738 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 36809 "Photo.c" +#line 36934 "Photo.c" } void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4756 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4756 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_master_reimported (self, photo, metadata); -#line 36818 "Photo.c" +#line 36943 "Photo.c" } static void library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { LibraryPhoto* _tmp0_; PhotoMetadata* _tmp1_; -#line 4742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4761 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4761 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 4743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo; -#line 4743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = metadata; -#line 4743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4762 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 36835 "Photo.c" +#line 36960 "Photo.c" } void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4761 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4761 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_editable_reimported (self, photo, metadata); -#line 36844 "Photo.c" +#line 36969 "Photo.c" } static void library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { LibraryPhoto* _tmp0_; PhotoMetadata* _tmp1_; -#line 4747 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4766 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4747 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4766 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 4748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo; -#line 4748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = metadata; -#line 4748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 36861 "Photo.c" +#line 36986 "Photo.c" } void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4747 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4766 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4747 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4766 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_source_reimported (self, photo, metadata); -#line 36870 "Photo.c" +#line 36995 "Photo.c" } static void library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { LibraryPhoto* _tmp0_; PhotoMetadata* _tmp1_; -#line 4752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4771 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4771 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 4753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo; -#line 4753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = metadata; -#line 4753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4772 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 36887 "Photo.c" +#line 37012 "Photo.c" } void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4771 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4752 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4771 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_baseline_reimported (self, photo, metadata); -#line 36896 "Photo.c" +#line 37021 "Photo.c" } @@ -36907,38 +37032,38 @@ static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (Me gint64 _tmp0_; PhotoID _tmp1_ = {0}; LibraryPhoto* _tmp2_; -#line 4756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4775 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4776 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = numeric_id; -#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4776 "/home/jens/Source/shotwell/src/Photo.vala" photo_id_init (&_tmp1_, _tmp0_); -#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4776 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = library_photo_source_collection_fetch (self, &_tmp1_); -#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4776 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource); -#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4776 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 36918 "Photo.c" +#line 37043 "Photo.c" } static void library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) { GeeCollection* _tmp0_; GeeCollection* _tmp1_; -#line 4760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4779 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4779 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 4760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4779 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 4762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = added; -#line 4762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = removed; -#line 4762 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4781 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 36937 "Photo.c" +#line 37062 "Photo.c" } @@ -36946,40 +37071,40 @@ static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryP gboolean result = FALSE; DataSource* _tmp0_; gboolean _tmp1_; -#line 4766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4785 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE); -#line 4766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4785 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); -#line 4766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4785 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); -#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = source; -#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); -#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 36959 "Photo.c" +#line 37084 "Photo.c" } static void library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) { GeeCollection* _tmp0_; GeeCollection* _tmp1_; -#line 4770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4789 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4789 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 4770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4789 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 4772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = added; -#line 4772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = removed; -#line 4772 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4791 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 36978 "Photo.c" +#line 37103 "Photo.c" } @@ -36987,21 +37112,21 @@ static gboolean library_photo_source_collection_check_if_offline_photo (LibraryP gboolean result = FALSE; DataSource* _tmp0_; gboolean _tmp1_; -#line 4776 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE); -#line 4776 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); -#line 4776 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); -#line 4777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = source; -#line 4777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); -#line 4777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 4777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37000 "Photo.c" +#line 37125 "Photo.c" } @@ -37024,7 +37149,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { _tmp3_ = end; #line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 37023 "Photo.c" +#line 37148 "Photo.c" glong _tmp4_; #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; @@ -37032,7 +37157,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = _tmp4_; #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 37031 "Photo.c" +#line 37156 "Photo.c" } else { gchar* _tmp5_; gchar* _tmp6_; @@ -37044,7 +37169,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = (glong) (_tmp5_ - _tmp6_); #line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 37043 "Photo.c" +#line 37168 "Photo.c" } } @@ -37068,21 +37193,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp1_ = offset; #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 37067 "Photo.c" +#line 37192 "Photo.c" glong _tmp2_; #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); -#line 37073 "Photo.c" +#line 37198 "Photo.c" } else { #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 37077 "Photo.c" +#line 37202 "Photo.c" } #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 37081 "Photo.c" +#line 37206 "Photo.c" glong _tmp3_; glong _tmp4_; glong _tmp5_; @@ -37094,7 +37219,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); #line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; -#line 37093 "Photo.c" +#line 37218 "Photo.c" } else { gint _tmp6_; gint _tmp7_; @@ -37104,13 +37229,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp7_ = _tmp6_; #line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; -#line 37103 "Photo.c" +#line 37228 "Photo.c" } #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { -#line 37109 "Photo.c" +#line 37234 "Photo.c" glong _tmp9_; glong _tmp10_; glong _tmp11_; @@ -37124,7 +37249,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp11_ = offset; #line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 37123 "Photo.c" +#line 37248 "Photo.c" } else { glong _tmp12_; glong _tmp13_; @@ -37134,13 +37259,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp13_ = string_length; #line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 37133 "Photo.c" +#line 37258 "Photo.c" } #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { -#line 37139 "Photo.c" +#line 37264 "Photo.c" glong _tmp15_; glong _tmp16_; #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" @@ -37149,7 +37274,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp16_ = offset; #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; -#line 37148 "Photo.c" +#line 37273 "Photo.c" } #line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; @@ -37169,7 +37294,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { result = _tmp22_; #line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 37168 "Photo.c" +#line 37293 "Photo.c" } @@ -37185,37 +37310,37 @@ static MediaSource* library_photo_source_collection_real_fetch_by_source_id (Med gchar* _tmp5_; gint64 _tmp6_; MediaSource* _tmp7_; -#line 4780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4799 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4799 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (source_id != NULL, NULL); -#line 4781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = source_id; -#line 4781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME); -#line 4781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp1_, "source_id.has_prefix(Photo.TYPENAME)"); -#line 4782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = source_id; -#line 4782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = strlen (PHOTO_TYPENAME); -#line 4782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 4782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = string_substring (_tmp2_, (glong) _tmp4_, (glong) -1); -#line 4782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" numeric_only = _tmp5_; -#line 4784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = parse_int64 (numeric_only, 16); -#line 4784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = media_source_collection_fetch_by_numeric_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp6_); -#line 4784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp7_; -#line 4784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (numeric_only); -#line 4784 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37214 "Photo.c" +#line 37339 "Photo.c" } @@ -37227,27 +37352,27 @@ static GeeCollection* library_photo_source_collection_real_get_event_source_ids EventID _tmp2_; GeeArrayList* _tmp3_; GeeCollection* _tmp4_; -#line 4787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (event_id != NULL, NULL); -#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); -#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = *event_id; -#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_table_get_event_source_ids (_tmp1_, &_tmp2_); -#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); -#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37246 "Photo.c" +#line 37371 "Photo.c" } @@ -37256,21 +37381,21 @@ LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollectio PhotoID _tmp0_; gint64 _tmp1_; DataSource* _tmp2_; -#line 4791 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4791 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (photo_id != NULL, NULL); -#line 4792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = *photo_id; -#line 4792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_.id; -#line 4792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = database_source_collection_fetch_by_key (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), _tmp1_); -#line 4792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37269 "Photo.c" +#line 37394 "Photo.c" } @@ -37279,21 +37404,21 @@ LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPho GeeHashMap* _tmp0_; GFile* _tmp1_; gpointer _tmp2_; -#line 4795 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4814 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4795 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4814 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->by_editable_file; -#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file; -#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" result = (LibraryPhoto*) _tmp2_; -#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37292 "Photo.c" +#line 37417 "Photo.c" } @@ -37302,21 +37427,21 @@ LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (Lib GeeHashMap* _tmp0_; GFile* _tmp1_; gpointer _tmp2_; -#line 4799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4818 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4818 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->by_raw_development_file; -#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file; -#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4819 "/home/jens/Source/shotwell/src/Photo.vala" result = (LibraryPhoto*) _tmp2_; -#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4819 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37315 "Photo.c" +#line 37440 "Photo.c" } @@ -37336,110 +37461,110 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC LibraryPhoto* _tmp17_; GeeCollection* _tmp18_; GeeCollection* _tmp19_; -#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4822 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4822 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4822 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4822 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matches_master)); -#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4822 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matches_editable)); -#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4822 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matches_development)); -#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo; -#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo)); -#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = info; -#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = backing_photo_row_matches_file_info (_tmp2_, _tmp3_); -#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp2_); -#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 37363 "Photo.c" +#line 37488 "Photo.c" GeeCollection* _tmp6_; LibraryPhoto* _tmp7_; -#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4826 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = matches_master; -#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4826 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo; -#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4826 "/home/jens/Source/shotwell/src/Photo.vala" gee_collection_add (_tmp6_, _tmp7_); -#line 37372 "Photo.c" +#line 37497 "Photo.c" } -#line 4809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4828 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo; -#line 4809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4828 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo)); -#line 4809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4828 "/home/jens/Source/shotwell/src/Photo.vala" editable = _tmp9_; -#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = editable; -#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_ != NULL) { -#line 37384 "Photo.c" +#line 37509 "Photo.c" BackingPhotoRow* _tmp12_; GFileInfo* _tmp13_; gboolean _tmp14_; -#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = editable; -#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = info; -#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = backing_photo_row_matches_file_info (_tmp12_, _tmp13_); -#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp14_; -#line 37396 "Photo.c" +#line 37521 "Photo.c" } else { -#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = FALSE; -#line 37400 "Photo.c" +#line 37525 "Photo.c" } -#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_) { -#line 37404 "Photo.c" +#line 37529 "Photo.c" GeeCollection* _tmp15_; LibraryPhoto* _tmp16_; -#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = matches_editable; -#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo; -#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" gee_collection_add (_tmp15_, _tmp16_); -#line 37413 "Photo.c" +#line 37538 "Photo.c" } -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo; -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo)); -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" development = _tmp18_; -#line 4814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = development; -#line 4814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4833 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_ != NULL) { -#line 37425 "Photo.c" +#line 37550 "Photo.c" { GeeIterator* _row_it = NULL; GeeCollection* _tmp20_; GeeIterator* _tmp21_; -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = development; -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" _row_it = _tmp21_; -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37438 "Photo.c" +#line 37563 "Photo.c" GeeIterator* _tmp22_; gboolean _tmp23_; BackingPhotoRow* row = NULL; @@ -37448,74 +37573,74 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC BackingPhotoRow* _tmp26_; GFileInfo* _tmp27_; gboolean _tmp28_; -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _row_it; -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = gee_iterator_next (_tmp22_); -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp23_) { -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37455 "Photo.c" +#line 37580 "Photo.c" } -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _row_it; -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = gee_iterator_get (_tmp24_); -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" row = (BackingPhotoRow*) _tmp25_; -#line 4816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = row; -#line 4816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = info; -#line 4816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = backing_photo_row_matches_file_info (_tmp26_, _tmp27_); -#line 4816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_) { -#line 37471 "Photo.c" +#line 37596 "Photo.c" GeeCollection* _tmp29_; LibraryPhoto* _tmp30_; -#line 4817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = matches_development; -#line 4817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = photo; -#line 4817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" gee_collection_add (_tmp29_, _tmp30_); -#line 4819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 4819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37484 "Photo.c" +#line 37609 "Photo.c" } -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 37488 "Photo.c" +#line 37613 "Photo.c" } -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 37492 "Photo.c" +#line 37617 "Photo.c" } } -#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4822 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (development); -#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4822 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (editable); -#line 37499 "Photo.c" +#line 37624 "Photo.c" } void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matched_development) { -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4846 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4846 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4846 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matches_master)); -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4846 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matches_editable)); -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4846 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matched_development)); -#line 37514 "Photo.c" +#line 37639 "Photo.c" { GeeIterator* _photo_it = NULL; GeeMultiMap* _tmp0_; @@ -37525,27 +37650,27 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour GeeCollection* _tmp4_; GeeIterator* _tmp5_; GeeIterator* _tmp6_; -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->filesize_to_photo; -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = info; -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = g_file_info_get_size (_tmp1_); -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = gee_multi_map_get (_tmp0_, &_tmp2_); -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _photo_it = _tmp6_; -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37544 "Photo.c" +#line 37669 "Photo.c" GeeIterator* _tmp7_; gboolean _tmp8_; LibraryPhoto* photo = NULL; @@ -37556,41 +37681,41 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour GeeCollection* _tmp13_; GeeCollection* _tmp14_; GeeCollection* _tmp15_; -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _photo_it; -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = gee_iterator_next (_tmp7_); -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp8_) { -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37563 "Photo.c" +#line 37688 "Photo.c" } -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _photo_it; -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = gee_iterator_get (_tmp9_); -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" photo = (LibraryPhoto*) _tmp10_; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = info; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = matches_master; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = matches_editable; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = matched_development; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_compare_backing (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_); -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 37585 "Photo.c" +#line 37710 "Photo.c" } -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 37589 "Photo.c" +#line 37714 "Photo.c" } { GeeIterator* _media_it = NULL; @@ -37598,21 +37723,21 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour GeeCollection* _tmp17_; GeeIterator* _tmp18_; GeeIterator* _tmp19_; -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_; -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp17_); -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _media_it = _tmp19_; -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37611 "Photo.c" +#line 37736 "Photo.c" GeeIterator* _tmp20_; gboolean _tmp21_; MediaSource* media = NULL; @@ -37623,52 +37748,52 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour GeeCollection* _tmp26_; GeeCollection* _tmp27_; GeeCollection* _tmp28_; -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _media_it; -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = gee_iterator_next (_tmp20_); -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp21_) { -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37630 "Photo.c" +#line 37755 "Photo.c" } -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _media_it; -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = gee_iterator_get (_tmp22_); -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" media = (MediaSource*) _tmp23_; -#line 4833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = media; -#line 4833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = info; -#line 4833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = matches_master; -#line 4833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = matches_editable; -#line 4833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = matched_development; -#line 4833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_LIBRARY_PHOTO, LibraryPhoto), _tmp25_, _tmp26_, _tmp27_, _tmp28_); -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 37652 "Photo.c" +#line 37777 "Photo.c" } -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 37656 "Photo.c" +#line 37781 "Photo.c" } } void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize, PhotoID* result) { PhotoID _tmp19_ = {0}; -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4855 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4855 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (basename != NULL); -#line 37667 "Photo.c" +#line 37792 "Photo.c" { GeeIterator* _photo_it = NULL; GeeMultiMap* _tmp0_; @@ -37677,25 +37802,25 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho GeeCollection* _tmp3_; GeeIterator* _tmp4_; GeeIterator* _tmp5_; -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->filesize_to_photo; -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = filesize; -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_); -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _photo_it = _tmp5_; -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37694 "Photo.c" +#line 37819 "Photo.c" GeeIterator* _tmp6_; gboolean _tmp7_; LibraryPhoto* photo = NULL; @@ -37708,72 +37833,72 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho const gchar* _tmp14_; gint _tmp15_; gboolean _tmp16_; -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _photo_it; -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp7_) { -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37715 "Photo.c" +#line 37840 "Photo.c" } -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _photo_it; -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" photo = (LibraryPhoto*) _tmp9_; -#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo; -#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_; -#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = g_file_get_basename (_tmp12_); -#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = basename; -#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_); -#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_ == 0; -#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp12_); -#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_) { -#line 37741 "Photo.c" +#line 37866 "Photo.c" LibraryPhoto* _tmp17_; PhotoID _tmp18_ = {0}; -#line 4839 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4858 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo; -#line 4839 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4858 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo), &_tmp18_); -#line 4839 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4858 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp18_; -#line 4839 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4858 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4839 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4858 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 4839 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4858 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 37756 "Photo.c" +#line 37881 "Photo.c" } -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 37760 "Photo.c" +#line 37885 "Photo.c" } -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 37764 "Photo.c" +#line 37889 "Photo.c" } -#line 4842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4861 "/home/jens/Source/shotwell/src/Photo.vala" photo_id_init (&_tmp19_, PHOTO_ID_INVALID); -#line 4842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4861 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp19_; -#line 4842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4861 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 37772 "Photo.c" +#line 37897 "Photo.c" } @@ -37783,23 +37908,23 @@ gboolean library_photo_source_collection_has_basename_filesize_duplicate (Librar gint64 _tmp1_; PhotoID _tmp2_ = {0}; gboolean _tmp3_; -#line 4846 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4865 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE); -#line 4846 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4865 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (basename != NULL, FALSE); -#line 4847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = basename; -#line 4847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = filesize; -#line 4847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_); -#line 4847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_id_is_valid (&_tmp2_); -#line 4847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 4847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37798 "Photo.c" +#line 37923 "Photo.c" } @@ -37812,54 +37937,54 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS MediaSource* _tmp3_; LibraryPhoto* _tmp4_; LibraryPhoto* _tmp5_; -#line 4850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4869 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4869 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4870 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4870 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4870 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = file; -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4870 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_); -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4870 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4870 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4870 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp4_; -#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo; -#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4871 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ == NULL) { -#line 37833 "Photo.c" +#line 37958 "Photo.c" MediaSourceHoldingTank* _tmp6_; LibraryPhotoSourceHoldingTank* _tmp7_; GFile* _tmp8_; LibraryPhoto* _tmp9_; -#line 4853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4872 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4872 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); -#line 4853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4872 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = file; -#line 4853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4872 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_); -#line 4853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4872 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4872 "/home/jens/Source/shotwell/src/Photo.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4872 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp7_); -#line 37852 "Photo.c" +#line 37977 "Photo.c" } -#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4875 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4875 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37858 "Photo.c" +#line 37983 "Photo.c" } @@ -37870,27 +37995,27 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSo const gchar* _tmp2_; MediaSource* _tmp3_; LibraryPhoto* _tmp4_; -#line 4859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4878 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4878 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (md5 != NULL, NULL); -#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = md5; -#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_); -#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4879 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4879 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4879 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37889 "Photo.c" +#line 38014 "Photo.c" } @@ -37903,54 +38028,54 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS MediaSource* _tmp3_; LibraryPhoto* _tmp4_; LibraryPhoto* _tmp5_; -#line 4863 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4882 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4863 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4882 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4883 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4883 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4883 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = file; -#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4883 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_); -#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4883 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4883 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4883 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp4_; -#line 4865 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4884 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo; -#line 4865 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4884 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ == NULL) { -#line 37924 "Photo.c" +#line 38049 "Photo.c" MediaSourceHoldingTank* _tmp6_; LibraryPhotoSourceHoldingTank* _tmp7_; GFile* _tmp8_; LibraryPhoto* _tmp9_; -#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); -#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = file; -#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_); -#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp7_); -#line 37943 "Photo.c" +#line 38068 "Photo.c" } -#line 4869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4888 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4888 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37949 "Photo.c" +#line 38074 "Photo.c" } @@ -37961,27 +38086,27 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSo const gchar* _tmp2_; MediaSource* _tmp3_; LibraryPhoto* _tmp4_; -#line 4872 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4891 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4872 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4891 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (md5 != NULL, NULL); -#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = md5; -#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_); -#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37980 "Photo.c" +#line 38105 "Photo.c" } @@ -37991,23 +38116,23 @@ gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollec MediaSourceHoldingTank* _tmp1_; gint _tmp2_; gint _tmp3_; -#line 4876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4895 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), 0); -#line 4877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = source_holding_tank_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank)); -#line 4877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 4877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4896 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4896 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 4877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4896 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38006 "Photo.c" +#line 38131 "Photo.c" } @@ -38032,169 +38157,169 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou LibraryPhoto* _tmp14_; LibraryPhoto* _tmp15_; LibraryPhoto* _tmp16_; -#line 4880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4899 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4899 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 4881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4900 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file; -#line 4881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4900 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp0_); -#line 4881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4900 "/home/jens/Source/shotwell/src/Photo.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4901 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo; -#line 4882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4901 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 4883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE; -#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4904 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4904 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4904 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38053 "Photo.c" +#line 38178 "Photo.c" } -#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4904 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38057 "Photo.c" +#line 38182 "Photo.c" } -#line 4888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; -#line 4888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = library_photo_source_collection_fetch_by_editable_file (self, _tmp3_); -#line 4888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4907 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4907 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp4_; -#line 4889 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4908 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo; -#line 4889 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4908 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ != NULL) { -#line 4890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE; -#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4911 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4911 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4911 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38079 "Photo.c" +#line 38204 "Photo.c" } -#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4911 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38083 "Photo.c" +#line 38208 "Photo.c" } -#line 4895 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4914 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = file; -#line 4895 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4914 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = library_photo_source_collection_fetch_by_raw_development_file (self, _tmp6_); -#line 4895 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4914 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4895 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4914 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp7_; -#line 4896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4915 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo; -#line 4896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4915 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 4897 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4916 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER; -#line 4899 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4899 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 4899 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38105 "Photo.c" +#line 38230 "Photo.c" } -#line 4899 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38109 "Photo.c" +#line 38234 "Photo.c" } -#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = file; -#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = library_photo_source_collection_get_trashed_by_file (self, _tmp9_); -#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp10_) : NULL; -#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_ == NULL) { -#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp10_); -#line 38121 "Photo.c" +#line 38246 "Photo.c" } -#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp11_; -#line 4903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo; -#line 4903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4922 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_ != NULL) { -#line 4904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4923 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH; -#line 4906 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4906 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 4906 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38139 "Photo.c" +#line 38264 "Photo.c" } -#line 4906 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38143 "Photo.c" +#line 38268 "Photo.c" } -#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = file; -#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = library_photo_source_collection_get_offline_by_file (self, _tmp13_); -#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp14_) : NULL; -#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_ == NULL) { -#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp14_); -#line 38155 "Photo.c" +#line 38280 "Photo.c" } -#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp15_; -#line 4910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4929 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo; -#line 4910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4929 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_ != NULL) { -#line 4911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4930 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE; -#line 4913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4932 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4932 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 4913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4932 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38173 "Photo.c" +#line 38298 "Photo.c" } -#line 4913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4932 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38177 "Photo.c" +#line 38302 "Photo.c" } -#line 4916 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4935 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN; -#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4937 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4937 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4937 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4937 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38189 "Photo.c" +#line 38314 "Photo.c" } -#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4937 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38193 "Photo.c" +#line 38318 "Photo.c" } @@ -38213,67 +38338,67 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect SourceBacklink* _tmp9_; gboolean _tmp10_; gboolean _tmp11_; -#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4940 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4940 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (backlink), FALSE); -#line 4922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4941 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backlink; -#line 4922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4941 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->has_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp0_); -#line 4922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4941 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 4923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4942 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4942 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38226 "Photo.c" +#line 38351 "Photo.c" } -#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = backlink; -#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp4_); -#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp3_); -#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 4926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4945 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4945 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38246 "Photo.c" +#line 38371 "Photo.c" } -#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = backlink; -#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp9_); -#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4947 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp8_); -#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4947 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 4929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4948 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4948 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38266 "Photo.c" +#line 38391 "Photo.c" } -#line 4931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4950 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 4931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4950 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38272 "Photo.c" +#line 38397 "Photo.c" } @@ -38286,35 +38411,35 @@ static void library_photo_source_collection_real_remove_backlink (SourceCollecti MediaSourceHoldingTank* _tmp4_; SourceBacklink* _tmp5_; SourceBacklink* _tmp6_; -#line 4934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4953 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4953 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_SOURCE_BACKLINK (backlink)); -#line 4935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = backlink; -#line 4935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4954 "/home/jens/Source/shotwell/src/Photo.vala" source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_); -#line 4935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4954 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4955 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4955 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 4936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4955 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = backlink; -#line 4936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4955 "/home/jens/Source/shotwell/src/Photo.vala" source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp5_); -#line 4936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4955 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp4_); -#line 4938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = backlink; -#line 4938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4957 "/home/jens/Source/shotwell/src/Photo.vala" SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_); -#line 38313 "Photo.c" +#line 38438 "Photo.c" } @@ -38323,38 +38448,38 @@ static TransactionController* library_photo_source_collection_real_get_transacti LibraryPhotoSourceCollection* self; TransactionController* _tmp0_; TransactionController* _tmp2_; -#line 4455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4474 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->_transaction_controller; -#line 4456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4475 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ == NULL) { -#line 38328 "Photo.c" +#line 38453 "Photo.c" MediaSourceTransactionController* _tmp1_; -#line 4457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4476 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4476 "/home/jens/Source/shotwell/src/Photo.vala" _transaction_controller_unref0 (self->priv->_transaction_controller); -#line 4457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4476 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController); -#line 38336 "Photo.c" +#line 38461 "Photo.c" } -#line 4459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4478 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->_transaction_controller; -#line 4459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4478 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 4459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4478 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38344 "Photo.c" +#line 38469 "Photo.c" } static void library_photo_source_collection_real_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4477 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4496 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4477 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4496 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38353 "Photo.c" +#line 38478 "Photo.c" } @@ -38365,119 +38490,119 @@ static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * clos register gpointer data1; register gpointer data2; cc = (GCClosure *) closure; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (n_param_values == 3); -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" if (G_CCLOSURE_SWAP_DATA (closure)) { -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" data1 = closure->data; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" data2 = param_values->data[0].v_pointer; -#line 38372 "Photo.c" +#line 38497 "Photo.c" } else { -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" data1 = param_values->data[0].v_pointer; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" data2 = closure->data; -#line 38378 "Photo.c" +#line 38503 "Photo.c" } -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" callback = (GMarshalFunc_VOID__OBJECT_MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback); -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" callback (data1, g_value_get_object (param_values + 1), value_get_media_metadata (param_values + 2), data2); -#line 38384 "Photo.c" +#line 38509 "Photo.c" } static void library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4480 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4499 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4480 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4499 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38393 "Photo.c" +#line 38518 "Photo.c" } static void library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4502 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4502 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38402 "Photo.c" +#line 38527 "Photo.c" } static void library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4486 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4505 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4486 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4505 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38411 "Photo.c" +#line 38536 "Photo.c" } static void library_photo_source_collection_class_init (LibraryPhotoSourceCollectionClass * klass) { -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_parent_class = g_type_class_peek_parent (klass); -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((DataCollectionClass *) klass)->finalize = library_photo_source_collection_finalize; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" g_type_class_add_private (klass, sizeof (LibraryPhotoSourceCollectionPrivate)); -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) library_photo_source_collection_real_create_trashcan; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) library_photo_source_collection_real_create_offline_bin; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*) (MediaSourceCollection *, Workers*, GCancellable*)) library_photo_source_collection_real_create_media_monitor; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) library_photo_source_collection_real_holds_type_of_source; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*) (MediaSourceCollection *)) library_photo_source_collection_real_get_typename; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*) (MediaSourceCollection *, GFile*)) library_photo_source_collection_real_is_file_recognized; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) library_photo_source_collection_real_notify_contents_altered; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((DataCollectionClass *) klass)->items_altered = (void (*) (DataCollection *, GeeMap*)) library_photo_source_collection_real_items_altered; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*) (MediaSourceCollection *, GeeCollection*)) library_photo_source_collection_real_postprocess_imported_media; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->notify_master_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_master_reimported; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->notify_editable_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_editable_reimported; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->notify_source_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_source_reimported; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->notify_baseline_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_baseline_reimported; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*) (MediaSourceCollection *, gint64)) library_photo_source_collection_real_fetch_by_numeric_id; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->fetch_by_source_id = (MediaSource* (*) (MediaSourceCollection *, const gchar*)) library_photo_source_collection_real_fetch_by_source_id; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*) (MediaSourceCollection *, EventID*)) library_photo_source_collection_real_get_event_source_ids; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((SourceCollectionClass *) klass)->has_backlink = (gboolean (*) (SourceCollection *, SourceBacklink*)) library_photo_source_collection_real_has_backlink; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((SourceCollectionClass *) klass)->remove_backlink = (void (*) (SourceCollection *, SourceBacklink*)) library_photo_source_collection_real_remove_backlink; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->master_reimported = library_photo_source_collection_real_master_reimported; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->editable_reimported = library_photo_source_collection_real_editable_reimported; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->baseline_reimported = library_photo_source_collection_real_baseline_reimported; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->source_reimported = library_photo_source_collection_real_source_reimported; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = library_photo_source_collection_real_get_transaction_controller; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL] = g_signal_new ("master-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, master_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA); -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL] = g_signal_new ("editable-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, editable_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA); -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL] = g_signal_new ("baseline-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA); -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL] = g_signal_new ("source-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA); -#line 38476 "Photo.c" +#line 38601 "Photo.c" } @@ -38488,59 +38613,59 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol GeeHashMap* _tmp3_; GeeHashMap* _tmp4_; GeeTreeMultiMap* _tmp5_; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv = LIBRARY_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self); #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" + self->priv = LIBRARY_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self); +#line 4482 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->_transaction_controller = NULL; -#line 4464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); -#line 4464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4483 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->by_editable_file = _tmp0_; -#line 4466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4485 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); -#line 4466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4485 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->by_raw_development_file = _tmp1_; -#line 4468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_tree_multi_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL); -#line 4468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4487 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->filesize_to_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 4470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4489 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL); -#line 4470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4489 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->photo_to_master_filesize = _tmp3_; -#line 4472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4491 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL); -#line 4472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4491 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->photo_to_editable_filesize = _tmp4_; -#line 4474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4493 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_tree_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); -#line 4474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4493 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->photo_to_raw_development_filesize = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 38515 "Photo.c" +#line 38640 "Photo.c" } static void library_photo_source_collection_finalize (DataCollection * obj) { LibraryPhotoSourceCollection * self; -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); +#line 4482 "/home/jens/Source/shotwell/src/Photo.vala" _transaction_controller_unref0 (self->priv->_transaction_controller); -#line 4464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4483 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->by_editable_file); -#line 4466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4485 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->by_raw_development_file); -#line 4468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4487 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->filesize_to_photo); -#line 4470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4489 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->photo_to_master_filesize); -#line 4472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4491 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->photo_to_editable_filesize); -#line 4474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4493 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->photo_to_raw_development_filesize); -#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->finalize (obj); -#line 38539 "Photo.c" +#line 38664 "Photo.c" } @@ -38557,9 +38682,9 @@ GType library_photo_source_collection_get_type (void) { static void _library_photo_generate_thumbnails_one_shot_callback (gpointer self) { -#line 4966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4985 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_generate_thumbnails ((LibraryPhoto*) self); -#line 38558 "Photo.c" +#line 38683 "Photo.c" } @@ -38571,69 +38696,69 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row) guint64 _tmp3_; PhotoRow* _tmp7_; guint64 _tmp8_; -#line 4961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4980 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_ROW (row), NULL); -#line 4962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = row; -#line 4962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4981 "/home/jens/Source/shotwell/src/Photo.vala" self = (LibraryPhoto*) photo_construct (object_type, _tmp0_); -#line 4964 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4983 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); -#line 4964 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4983 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->import_keywords = NULL; -#line 4966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4985 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self); -#line 4966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4985 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler); -#line 4966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4985 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->thumbnail_scheduler = _tmp1_; -#line 4969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = row; -#line 4969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->flags; -#line 4969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4988 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp3_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { -#line 38592 "Photo.c" +#line 38717 "Photo.c" LibraryPhotoSourceCollection* _tmp4_; PhotoRow* _tmp5_; const gchar* _tmp6_; -#line 4970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4989 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = library_photo_global; -#line 4970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4989 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = row; -#line 4970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4989 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->backlinks; -#line 4970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4989 "/home/jens/Source/shotwell/src/Photo.vala" data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_); -#line 38604 "Photo.c" +#line 38729 "Photo.c" } -#line 4972 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4991 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = row; -#line 4972 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4991 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->flags; -#line 4972 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4991 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { -#line 38612 "Photo.c" +#line 38737 "Photo.c" PhotoRow* _tmp9_; guint64 _tmp10_; -#line 4973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = row; -#line 4973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->flags; -#line 4973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4992 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_upgrade_rating_flags (self, _tmp10_); -#line 38621 "Photo.c" +#line 38746 "Photo.c" } -#line 4961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4980 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 38625 "Photo.c" +#line 38750 "Photo.c" } static LibraryPhoto* library_photo_new (PhotoRow* row) { -#line 4961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4980 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_construct (TYPE_LIBRARY_PHOTO, row); -#line 38632 "Photo.c" +#line 38757 "Photo.c" } @@ -38651,87 +38776,87 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty PhotoImportParams* _tmp13_; PhotoRow* _tmp14_; guint64 _tmp15_; -#line 4976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4995 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (import_params), NULL); -#line 4977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4996 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = import_params; -#line 4977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4996 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_->row; -#line 4977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4996 "/home/jens/Source/shotwell/src/Photo.vala" self = (LibraryPhoto*) photo_construct (object_type, _tmp1_); -#line 4979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = import_params; -#line 4979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->keywords; -#line 4979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _g_object_ref0 (_tmp3_); -#line 4979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4998 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); -#line 4979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4998 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->import_keywords = _tmp4_; -#line 4980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self); -#line 4980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4999 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler); -#line 4980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4999 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->thumbnail_scheduler = _tmp5_; -#line 4983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = import_params; -#line 4983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->row; -#line 4983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->flags; -#line 4983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { -#line 38682 "Photo.c" +#line 38807 "Photo.c" LibraryPhotoSourceCollection* _tmp9_; PhotoImportParams* _tmp10_; PhotoRow* _tmp11_; const gchar* _tmp12_; -#line 4984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = library_photo_global; -#line 4984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = import_params; -#line 4984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_->row; -#line 4984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->backlinks; -#line 4984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp12_); -#line 38697 "Photo.c" +#line 38822 "Photo.c" } -#line 4986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5005 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = import_params; -#line 4986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5005 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->row; -#line 4986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5005 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->flags; -#line 4986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5005 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp15_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { -#line 38707 "Photo.c" +#line 38832 "Photo.c" PhotoImportParams* _tmp16_; PhotoRow* _tmp17_; guint64 _tmp18_; -#line 4987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5006 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = import_params; -#line 4987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5006 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_->row; -#line 4987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5006 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_->flags; -#line 4987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5006 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_upgrade_rating_flags (self, _tmp18_); -#line 38719 "Photo.c" +#line 38844 "Photo.c" } -#line 4976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4995 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 38723 "Photo.c" +#line 38848 "Photo.c" } static LibraryPhoto* library_photo_new_from_import_params (PhotoImportParams* import_params) { -#line 4976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4995 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_construct_from_import_params (TYPE_LIBRARY_PHOTO, import_params); -#line 38730 "Photo.c" +#line 38855 "Photo.c" } @@ -38760,59 +38885,59 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { GeeArrayList* _tmp39_; LibraryPhotoSourceCollection* _tmp40_; GeeArrayList* _tmp41_; -#line 4991 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5010 "/home/jens/Source/shotwell/src/Photo.vala" photo_init_photo (); -#line 4993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5012 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = library_photo_source_collection_new (); -#line 4993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5012 "/home/jens/Source/shotwell/src/Photo.vala" _data_collection_unref0 (library_photo_global); -#line 4993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5012 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_global = _tmp0_; -#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_table_get_all (_tmp2_); -#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5016 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5016 "/home/jens/Source/shotwell/src/Photo.vala" all = _tmp4_; -#line 4998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5017 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); -#line 4998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5017 "/home/jens/Source/shotwell/src/Photo.vala" all_photos = _tmp5_; -#line 4999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5018 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); -#line 4999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5018 "/home/jens/Source/shotwell/src/Photo.vala" trashed_photos = _tmp6_; -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5019 "/home/jens/Source/shotwell/src/Photo.vala" offline_photos = _tmp7_; -#line 5001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = all; -#line 5001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 5001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_; -#line 5001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5020 "/home/jens/Source/shotwell/src/Photo.vala" count = _tmp10_; -#line 38799 "Photo.c" +#line 38924 "Photo.c" { gint ctr = 0; -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5021 "/home/jens/Source/shotwell/src/Photo.vala" ctr = 0; -#line 38804 "Photo.c" +#line 38929 "Photo.c" { gboolean _tmp11_ = FALSE; -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5021 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 38811 "Photo.c" +#line 38936 "Photo.c" gint _tmp13_; gint _tmp14_; PhotoRow* row = NULL; @@ -38828,159 +38953,159 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { guint64 _tmp22_; ProgressMonitor _tmp30_; void* _tmp30__target; -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5021 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp11_) { -#line 38829 "Photo.c" +#line 38954 "Photo.c" gint _tmp12_; -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = ctr; -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5021 "/home/jens/Source/shotwell/src/Photo.vala" ctr = _tmp12_ + 1; -#line 38835 "Photo.c" +#line 38960 "Photo.c" } -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = ctr; -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = count; -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5021 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp13_ < _tmp14_)) { -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5021 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 38847 "Photo.c" +#line 38972 "Photo.c" } -#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = all; -#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = ctr; -#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_); -#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5022 "/home/jens/Source/shotwell/src/Photo.vala" row = (PhotoRow*) _tmp17_; -#line 5004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = row; -#line 5004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = library_photo_new (_tmp18_); -#line 5004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5023 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp19_; -#line 5005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5024 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = row; -#line 5005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5024 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_->flags; -#line 5005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5024 "/home/jens/Source/shotwell/src/Photo.vala" flags = _tmp21_; -#line 5007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = flags; -#line 5007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5026 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp22_ & LIBRARY_PHOTO_FLAG_TRASH) != ((guint64) 0)) { -#line 38873 "Photo.c" +#line 38998 "Photo.c" GeeArrayList* _tmp23_; LibraryPhoto* _tmp24_; -#line 5008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = trashed_photos; -#line 5008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = photo; -#line 5008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5027 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); -#line 38882 "Photo.c" +#line 39007 "Photo.c" } else { guint64 _tmp25_; -#line 5009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = flags; -#line 5009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5028 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp25_ & LIBRARY_PHOTO_FLAG_OFFLINE) != ((guint64) 0)) { -#line 38889 "Photo.c" +#line 39014 "Photo.c" GeeArrayList* _tmp26_; LibraryPhoto* _tmp27_; -#line 5010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5029 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = offline_photos; -#line 5010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5029 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = photo; -#line 5010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5029 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_); -#line 38898 "Photo.c" +#line 39023 "Photo.c" } else { GeeArrayList* _tmp28_; LibraryPhoto* _tmp29_; -#line 5012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5031 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = all_photos; -#line 5012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5031 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = photo; -#line 5012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5031 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); -#line 38908 "Photo.c" +#line 39033 "Photo.c" } } -#line 5014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = monitor; -#line 5014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30__target = monitor_target; -#line 5014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp30_ != NULL) { -#line 38917 "Photo.c" +#line 39042 "Photo.c" ProgressMonitor _tmp31_; void* _tmp31__target; gint _tmp32_; gint _tmp33_; -#line 5015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = monitor; -#line 5015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31__target = monitor_target; -#line 5015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = ctr; -#line 5015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = count; -#line 5015 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ ((guint64) _tmp32_, (guint64) _tmp33_, TRUE, _tmp31__target); -#line 38932 "Photo.c" +#line 39057 "Photo.c" } -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (row); -#line 38938 "Photo.c" +#line 39063 "Photo.c" } } } -#line 5018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = library_photo_global; -#line 5018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = all_photos; -#line 5018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); -#line 5018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_; -#line 5018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp37_); -#line 5019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = library_photo_global; -#line 5019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = trashed_photos; -#line 5019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5038 "/home/jens/Source/shotwell/src/Photo.vala" media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = library_photo_global; -#line 5020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = offline_photos; -#line 5020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5039 "/home/jens/Source/shotwell/src/Photo.vala" media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 4990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5009 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (offline_photos); -#line 4990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5009 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (trashed_photos); -#line 4990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5009 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (all_photos); -#line 4990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5009 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (all); -#line 38972 "Photo.c" +#line 39097 "Photo.c" } void library_photo_terminate (void) { -#line 5024 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5043 "/home/jens/Source/shotwell/src/Photo.vala" photo_terminate_photo (); -#line 38979 "Photo.c" +#line 39104 "Photo.c" } @@ -38997,139 +39122,139 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot gboolean _tmp6_; PhotoImportParams* _tmp7_; LibraryPhoto* _tmp8_; -#line 5031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5050 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0); -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = params; -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->row; -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5052 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_add (_tmp1_, _tmp3_, &_tmp4_); -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5052 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5052 "/home/jens/Source/shotwell/src/Photo.vala" photo_id = _tmp5_; -#line 5034 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5053 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_id_is_invalid (&photo_id); -#line 5034 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5053 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 5035 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5054 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 5035 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5054 "/home/jens/Source/shotwell/src/Photo.vala" _vala_photo = NULL; -#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5056 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_DATABASE_ERROR; -#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5056 "/home/jens/Source/shotwell/src/Photo.vala" if (photo) { -#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5056 "/home/jens/Source/shotwell/src/Photo.vala" *photo = _vala_photo; -#line 39028 "Photo.c" +#line 39153 "Photo.c" } else { -#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5056 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 39032 "Photo.c" +#line 39157 "Photo.c" } -#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5056 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39036 "Photo.c" +#line 39161 "Photo.c" } -#line 5041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5060 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = params; -#line 5041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5060 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = library_photo_new_from_import_params (_tmp7_); -#line 5041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5060 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 5041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5060 "/home/jens/Source/shotwell/src/Photo.vala" _vala_photo = _tmp8_; -#line 5043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5062 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_SUCCESS; -#line 5043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5062 "/home/jens/Source/shotwell/src/Photo.vala" if (photo) { -#line 5043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5062 "/home/jens/Source/shotwell/src/Photo.vala" *photo = _vala_photo; -#line 39052 "Photo.c" +#line 39177 "Photo.c" } else { -#line 5043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5062 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 39056 "Photo.c" +#line 39181 "Photo.c" } -#line 5043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5062 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39060 "Photo.c" +#line 39185 "Photo.c" } void library_photo_import_failed (LibraryPhoto* photo) { GError * _inner_error_ = NULL; -#line 5046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5065 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 39068 "Photo.c" +#line 39193 "Photo.c" { PhotoTable* _tmp0_; PhotoTable* _tmp1_; LibraryPhoto* _tmp2_; PhotoID _tmp3_ = {0}; -#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); -#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo; -#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo), &_tmp3_); -#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_remove (_tmp1_, &_tmp3_, &_inner_error_); -#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); -#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 39090 "Photo.c" - goto __catch407_database_error; +#line 39215 "Photo.c" + goto __catch419_database_error; } -#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39099 "Photo.c" +#line 39224 "Photo.c" } } - goto __finally407; - __catch407_database_error: + goto __finally419; + __catch419_database_error: { GError* err = NULL; GError* _tmp4_; -#line 5047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5066 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 5047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5066 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 5050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5069 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = err; -#line 5050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5069 "/home/jens/Source/shotwell/src/Photo.vala" app_window_database_error (_tmp4_); -#line 5047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5066 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39117 "Photo.c" +#line 39242 "Photo.c" } - __finally407: -#line 5047 "/home/jens/Source/shotwell/src/Photo.vala" + __finally419: +#line 5066 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5066 "/home/jens/Source/shotwell/src/Photo.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 5047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5066 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 5047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5066 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39128 "Photo.c" +#line 39253 "Photo.c" } } @@ -39139,21 +39264,21 @@ static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetad PhotoMetadata* _tmp0_; LibraryPhotoSourceCollection* _tmp1_; PhotoMetadata* _tmp2_; -#line 5054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5073 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5073 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 5055 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5074 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = metadata; -#line 5055 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5074 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_CLASS (library_photo_parent_class)->notify_master_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); -#line 5057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5076 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = library_photo_global; -#line 5057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5076 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 5057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5076 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_notify_master_reimported (_tmp1_, self, _tmp2_); -#line 39152 "Photo.c" +#line 39277 "Photo.c" } @@ -39162,21 +39287,21 @@ static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMet PhotoMetadata* _tmp0_; LibraryPhotoSourceCollection* _tmp1_; PhotoMetadata* _tmp2_; -#line 5060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 5061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = metadata; -#line 5061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5080 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_CLASS (library_photo_parent_class)->notify_editable_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); -#line 5063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = library_photo_global; -#line 5063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 5063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_notify_editable_reimported (_tmp1_, self, _tmp2_); -#line 39175 "Photo.c" +#line 39300 "Photo.c" } @@ -39185,21 +39310,21 @@ static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetad PhotoMetadata* _tmp0_; LibraryPhotoSourceCollection* _tmp1_; PhotoMetadata* _tmp2_; -#line 5066 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5085 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5066 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5085 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5086 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = metadata; -#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5086 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_CLASS (library_photo_parent_class)->notify_source_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); -#line 5069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = library_photo_global; -#line 5069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 5069 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5088 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_notify_source_reimported (_tmp1_, self, _tmp2_); -#line 39198 "Photo.c" +#line 39323 "Photo.c" } @@ -39208,80 +39333,80 @@ static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMet PhotoMetadata* _tmp0_; LibraryPhotoSourceCollection* _tmp1_; PhotoMetadata* _tmp2_; -#line 5072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5091 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5091 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 5073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5092 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = metadata; -#line 5073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5092 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_CLASS (library_photo_parent_class)->notify_baseline_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); -#line 5075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = library_photo_global; -#line 5075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 5075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5094 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_notify_baseline_reimported (_tmp1_, self, _tmp2_); -#line 39221 "Photo.c" +#line 39346 "Photo.c" } static void library_photo_generate_thumbnails (LibraryPhoto* self) { GError * _inner_error_ = NULL; -#line 5078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5097 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); -#line 39229 "Photo.c" +#line 39354 "Photo.c" { -#line 5080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5099 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_cache_import_from_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TRUE, &_inner_error_); -#line 5080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5099 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 39235 "Photo.c" - goto __catch408_g_error; +#line 39360 "Photo.c" + goto __catch420_g_error; } } - goto __finally408; - __catch408_g_error: + goto __finally420; + __catch420_g_error: { GError* err = NULL; gchar* _tmp0_; gchar* _tmp1_; GError* _tmp2_; const gchar* _tmp3_; -#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = err; -#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->message; -#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:5082: Unable to generate thumbnails for %s: %s", _tmp1_, _tmp3_); -#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5101 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:5101: Unable to generate thumbnails for %s: %s", _tmp1_, _tmp3_); +#line 5101 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp1_); -#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39265 "Photo.c" +#line 39390 "Photo.c" } - __finally408: -#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" + __finally420: +#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5098 "/home/jens/Source/shotwell/src/Photo.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 5079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39276 "Photo.c" +#line 39401 "Photo.c" } -#line 5086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5105 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 39280 "Photo.c" +#line 39405 "Photo.c" } @@ -39289,28 +39414,28 @@ GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) { GeeCollection* result = NULL; GeeCollection* _tmp0_; GeeCollection* _tmp1_; -#line 5090 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5109 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL); -#line 5091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5110 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->import_keywords; -#line 5091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5110 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 5091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5110 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 5091 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5110 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39298 "Photo.c" +#line 39423 "Photo.c" } void library_photo_clear_import_keywords (LibraryPhoto* self) { -#line 5094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5113 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); -#line 5095 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5114 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); -#line 5095 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5114 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->import_keywords = NULL; -#line 39309 "Photo.c" +#line 39434 "Photo.c" } @@ -39319,44 +39444,44 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt gboolean _tmp0_ = FALSE; gboolean _tmp1_; Alteration* _tmp5_; -#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5117 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5117 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_ALTERATION (alteration)); -#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->block_thumbnail_generation; -#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5119 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp1_) { -#line 39326 "Photo.c" +#line 39451 "Photo.c" Alteration* _tmp2_; gboolean _tmp3_; -#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = alteration; -#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = alteration_has_subject (_tmp2_, "image"); -#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 39335 "Photo.c" +#line 39460 "Photo.c" } else { -#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 39339 "Photo.c" +#line 39464 "Photo.c" } -#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5119 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 39343 "Photo.c" +#line 39468 "Photo.c" OneShotScheduler* _tmp4_; -#line 5101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5120 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->thumbnail_scheduler; -#line 5101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5120 "/home/jens/Source/shotwell/src/Photo.vala" one_shot_scheduler_at_priority_idle (_tmp4_, G_PRIORITY_LOW); -#line 39349 "Photo.c" +#line 39474 "Photo.c" } -#line 5103 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5122 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = alteration; -#line 5103 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5122 "/home/jens/Source/shotwell/src/Photo.vala" DATA_OBJECT_CLASS (library_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp5_); -#line 39355 "Photo.c" +#line 39480 "Photo.c" } @@ -39367,31 +39492,31 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; GError * _inner_error_ = NULL; -#line 5106 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5125 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5106 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5125 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 5107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5126 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_inner_error_); -#line 5107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5126 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp0_; -#line 5107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5126 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5126 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5126 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39380 "Photo.c" +#line 39505 "Photo.c" } -#line 5109 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5128 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_BILINEAR, TRUE); -#line 5109 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5128 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 5109 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5128 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 5109 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5128 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39390 "Photo.c" +#line 39515 "Photo.c" } @@ -39399,71 +39524,71 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) { LibraryPhoto * self; Rotation _tmp0_; GError * _inner_error_ = NULL; -#line 5112 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5131 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5114 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5133 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->block_thumbnail_generation = TRUE; -#line 5115 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5134 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = rotation; -#line 5115 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5134 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_CLASS (library_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); -#line 5116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->block_thumbnail_generation = FALSE; -#line 39408 "Photo.c" +#line 39533 "Photo.c" { Rotation _tmp1_; -#line 5124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5143 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = rotation; -#line 5124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5143 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_cache_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_); -#line 5124 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5143 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 39417 "Photo.c" - goto __catch409_g_error; +#line 39542 "Photo.c" + goto __catch421_g_error; } } - goto __finally409; - __catch409_g_error: + goto __finally421; + __catch421_g_error: { GError* err = NULL; gchar* _tmp2_; gchar* _tmp3_; GError* _tmp4_; const gchar* _tmp5_; -#line 5123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 5123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 5127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 5127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 5127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = err; -#line 5127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->message; -#line 5127 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:5127: Unable to update thumbnails for %s: %s", _tmp3_, _tmp5_); -#line 5127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:5146: Unable to update thumbnails for %s: %s", _tmp3_, _tmp5_); +#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp3_); -#line 5123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39447 "Photo.c" +#line 39572 "Photo.c" } - __finally409: -#line 5123 "/home/jens/Source/shotwell/src/Photo.vala" + __finally421: +#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5142 "/home/jens/Source/shotwell/src/Photo.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 5123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 5123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39458 "Photo.c" +#line 39583 "Photo.c" } -#line 5130 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5149 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 39462 "Photo.c" +#line 39587 "Photo.c" } @@ -39475,40 +39600,40 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; GError * _inner_error_ = NULL; -#line 5134 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = scale; -#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_); -#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp2_; -#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39488 "Photo.c" +#line 39613 "Photo.c" } -#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp0_; -#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39500 "Photo.c" +#line 39625 "Photo.c" } static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, gint64 total_num_bytes, gpointer self) { -#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_on_duplicate_progress ((LibraryPhoto*) self, current_num_bytes, total_num_bytes); -#line 39507 "Photo.c" +#line 39632 "Photo.c" } @@ -39523,53 +39648,53 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh GFile* _tmp7_; gboolean _tmp8_; GError * _inner_error_ = NULL; -#line 5140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5159 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); -#line 5140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5159 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((backing == NULL) || IS_BACKING_PHOTO_ROW (backing)); -#line 5141 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5160 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_id_init (&backing_id, BACKING_PHOTO_ID_INVALID); -#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = backing; -#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 39534 "Photo.c" +#line 39659 "Photo.c" } else { BackingPhotoRow* _tmp2_; const gchar* _tmp3_; -#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = backing; -#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->filepath; -#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_ == NULL; -#line 39544 "Photo.c" +#line 39669 "Photo.c" } -#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 5143 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5162 "/home/jens/Source/shotwell/src/Photo.vala" *result = backing_id; -#line 5143 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5162 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39552 "Photo.c" +#line 39677 "Photo.c" } -#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = backing; -#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->filepath; -#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = g_file_new_for_path (_tmp5_); -#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp6_; -#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = file; -#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_file_query_exists (_tmp7_, NULL); -#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 39568 "Photo.c" +#line 39693 "Photo.c" GFile* dupe_file = NULL; GFile* _tmp9_; GFile* _tmp10_; @@ -39579,105 +39704,105 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh DetectedPhotoInformation* _tmp12_ = NULL; BackingPhotoRow* _tmp13_; BackingPhotoRow* _tmp14_; -#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = file; -#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = library_files_duplicate (_tmp9_, _library_photo_on_duplicate_progress_gfile_progress_callback, self, TRUE, &_inner_error_); -#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" dupe_file = _tmp10_; -#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39592 "Photo.c" +#line 39717 "Photo.c" } -#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = dupe_file; -#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_query_backing_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp11_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp12_, &_inner_error_); -#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp12_; -#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" state = _tmp13_; -#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39616 "Photo.c" +#line 39741 "Photo.c" } -#line 5152 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = state; -#line 5152 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 39622 "Photo.c" +#line 39747 "Photo.c" BackingPhotoTable* _tmp15_; BackingPhotoTable* _tmp16_; BackingPhotoRow* _tmp17_; BackingPhotoRow* _tmp18_; BackingPhotoID _tmp19_; -#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5172 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = backing_photo_table_get_instance (); -#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5172 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5172 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = state; -#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5172 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_add (_tmp16_, _tmp17_, &_inner_error_); -#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5172 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp16_); -#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5172 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5172 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5172 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (state); -#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5172 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5172 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5172 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5172 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39652 "Photo.c" +#line 39777 "Photo.c" } -#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = state; -#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->id; -#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" backing_id = _tmp19_; -#line 39660 "Photo.c" +#line 39785 "Photo.c" } -#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (state); -#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 39668 "Photo.c" +#line 39793 "Photo.c" } -#line 5158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" *result = backing_id; -#line 5158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 5158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39676 "Photo.c" +#line 39801 "Photo.c" } @@ -39742,231 +39867,231 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { GeeList* _tmp51_; GeeCollection* _tmp52_; GError * _inner_error_ = NULL; -#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5180 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL); -#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5182 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5182 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5182 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = library_files_duplicate (_tmp1_, _library_photo_on_duplicate_progress_gfile_progress_callback, self, TRUE, &_inner_error_); -#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5182 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5182 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5182 "/home/jens/Source/shotwell/src/Photo.vala" dupe_file = _tmp3_; -#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5182 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5182 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5182 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39761 "Photo.c" +#line 39886 "Photo.c" } -#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5185 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)); -#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5185 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5185 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_duplicate_backing_photo (self, _tmp5_, &_tmp6_, &_inner_error_); -#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5185 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5185 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp5_); -#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5185 "/home/jens/Source/shotwell/src/Photo.vala" dupe_editable_id = _tmp7_; -#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5185 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5185 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5185 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5185 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39783 "Photo.c" +#line 39908 "Photo.c" } -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL); -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_duplicate_backing_photo (self, _tmp9_, &_tmp10_, &_inner_error_); -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp9_); -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" dupe_raw_shotwell_id = _tmp11_; -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39805 "Photo.c" +#line 39930 "Photo.c" } -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA); -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_duplicate_backing_photo (self, _tmp13_, &_tmp14_, &_inner_error_); -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_; -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp13_); -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" dupe_raw_camera_id = _tmp15_; -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39827 "Photo.c" +#line 39952 "Photo.c" } -#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_EMBEDDED); -#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_duplicate_backing_photo (self, _tmp17_, &_tmp18_, &_inner_error_); -#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_; -#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp17_); -#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" dupe_raw_embedded_id = _tmp19_; -#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39849 "Photo.c" +#line 39974 "Photo.c" } -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo_table_get_instance (); -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_; -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), &_tmp22_); -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = dupe_file; -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = g_file_get_path (_tmp23_); -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_; -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = dupe_editable_id; -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = dupe_raw_shotwell_id; -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = dupe_raw_camera_id; -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = dupe_raw_embedded_id; -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_duplicate (_tmp21_, &_tmp22_, _tmp25_, &_tmp26_, &_tmp27_, &_tmp28_, &_tmp29_, &_tmp30_); -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_; -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp25_); -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp21_); -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" dupe_id = _tmp31_; -#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5196 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = photo_table_get_instance (); -#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5196 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_; -#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5196 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = dupe_id; -#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5196 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_table_get_row (_tmp33_, &_tmp34_); -#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5196 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = _tmp35_; -#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5196 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp33_); -#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5196 "/home/jens/Source/shotwell/src/Photo.vala" dupe_row = _tmp36_; -#line 5180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = dupe_row; -#line 5180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = library_photo_new (_tmp37_); -#line 5180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5199 "/home/jens/Source/shotwell/src/Photo.vala" dupe = _tmp38_; -#line 5183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5202 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = dupe; -#line 5183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5202 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_cache_duplicate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5205 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = library_photo_global; -#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5205 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = dupe; -#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5205 "/home/jens/Source/shotwell/src/Photo.vala" data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_OBJECT, DataObject)); -#line 5189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5208 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = dupe; -#line 5189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5208 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5208 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp43_; -#line 5189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5208 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp44_ != NULL; -#line 5189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5208 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp44_); -#line 5189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5208 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp45_) { -#line 39923 "Photo.c" +#line 40048 "Photo.c" LibraryPhoto* _tmp46_; Event* _tmp47_; Event* _tmp48_; LibraryPhoto* _tmp49_; -#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5209 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = dupe; -#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5209 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5209 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_; -#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5209 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = dupe; -#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5209 "/home/jens/Source/shotwell/src/Photo.vala" event_attach (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5209 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp48_); -#line 39940 "Photo.c" +#line 40065 "Photo.c" } -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = tag_global; -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = tag_source_collection_fetch_for_source (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5212 "/home/jens/Source/shotwell/src/Photo.vala" tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection); -#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5213 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = tags; -#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5213 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp52_ != NULL) { -#line 39952 "Photo.c" +#line 40077 "Photo.c" { GeeIterator* _tag_it = NULL; GeeCollection* _tmp53_; GeeIterator* _tmp54_; -#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = tags; -#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _tag_it = _tmp54_; -#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 39965 "Photo.c" +#line 40090 "Photo.c" GeeIterator* _tmp55_; gboolean _tmp56_; Tag* tag = NULL; @@ -39974,84 +40099,84 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { gpointer _tmp58_; Tag* _tmp59_; LibraryPhoto* _tmp60_; -#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _tag_it; -#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = gee_iterator_next (_tmp55_); -#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp56_) { -#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 39981 "Photo.c" +#line 40106 "Photo.c" } -#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = _tag_it; -#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = gee_iterator_get (_tmp57_); -#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" tag = (Tag*) _tmp58_; -#line 5196 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5215 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = tag; -#line 5196 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5215 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = dupe; -#line 5196 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5215 "/home/jens/Source/shotwell/src/Photo.vala" tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 39997 "Photo.c" +#line 40122 "Photo.c" } -#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_it); -#line 40001 "Photo.c" +#line 40126 "Photo.c" } } -#line 5200 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5219 "/home/jens/Source/shotwell/src/Photo.vala" result = dupe; -#line 5200 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5219 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tags); -#line 5200 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5219 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (dupe_row); -#line 5200 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5219 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5200 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5219 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40014 "Photo.c" +#line 40139 "Photo.c" } static void library_photo_on_duplicate_progress (LibraryPhoto* self, gint64 current, gint64 total) { -#line 5203 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5222 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); -#line 5204 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5223 "/home/jens/Source/shotwell/src/Photo.vala" spin_event_loop (); -#line 40023 "Photo.c" +#line 40148 "Photo.c" } static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flags) { guint64 _tmp0_; guint64 _tmp1_; -#line 5207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5226 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); -#line 5208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5227 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = flags; -#line 5208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5227 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp0_ & LIBRARY_PHOTO_FLAG_HIDDEN) != ((guint64) 0)) { -#line 5209 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5228 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_REJECTED); -#line 5210 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5229 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_HIDDEN, NULL); -#line 40040 "Photo.c" +#line 40165 "Photo.c" } -#line 5213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5232 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = flags; -#line 5213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5232 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp1_ & LIBRARY_PHOTO_FLAG_FAVORITE) != ((guint64) 0)) { -#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5233 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_FIVE); -#line 5215 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5234 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FAVORITE, NULL); -#line 40050 "Photo.c" +#line 40175 "Photo.c" } } @@ -40060,35 +40185,35 @@ static gboolean library_photo_real_is_trashed (MediaSource* base) { LibraryPhoto * self; gboolean result = FALSE; gboolean _tmp0_; -#line 5220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5239 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH); -#line 5221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5240 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 5221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5240 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40067 "Photo.c" +#line 40192 "Photo.c" } static void library_photo_real_trash (MediaSource* base) { LibraryPhoto * self; -#line 5224 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5243 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5225 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5244 "/home/jens/Source/shotwell/src/Photo.vala" photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL); -#line 40077 "Photo.c" +#line 40202 "Photo.c" } static void library_photo_real_untrash (MediaSource* base) { LibraryPhoto * self; -#line 5228 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5247 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5248 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL); -#line 40087 "Photo.c" +#line 40212 "Photo.c" } @@ -40096,35 +40221,35 @@ static gboolean library_photo_real_is_offline (Monitorable* base) { LibraryPhoto * self; gboolean result = FALSE; gboolean _tmp0_; -#line 5232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5251 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE); -#line 5233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5252 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 5233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5252 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40103 "Photo.c" +#line 40228 "Photo.c" } static void library_photo_real_mark_offline (Monitorable* base) { LibraryPhoto * self; -#line 5236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5255 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5237 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5256 "/home/jens/Source/shotwell/src/Photo.vala" photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL); -#line 40113 "Photo.c" +#line 40238 "Photo.c" } static void library_photo_real_mark_online (Monitorable* base) { LibraryPhoto * self; -#line 5240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5259 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5241 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5260 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL); -#line 40123 "Photo.c" +#line 40248 "Photo.c" } @@ -40132,15 +40257,15 @@ static gboolean library_photo_real_is_flagged (Flaggable* base) { LibraryPhoto * self; gboolean result = FALSE; gboolean _tmp0_; -#line 5244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5263 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED); -#line 5245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5264 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 5245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5264 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40139 "Photo.c" +#line 40264 "Photo.c" } @@ -40148,17 +40273,17 @@ static void library_photo_real_mark_flagged (Flaggable* base) { LibraryPhoto * self; Alteration* _tmp0_; Alteration* _tmp1_; -#line 5248 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5267 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = alteration_new ("metadata", "flagged"); -#line 5249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 5249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5268 "/home/jens/Source/shotwell/src/Photo.vala" photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_); -#line 5249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5268 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp1_); -#line 40157 "Photo.c" +#line 40282 "Photo.c" } @@ -40166,17 +40291,17 @@ static void library_photo_real_mark_unflagged (Flaggable* base) { LibraryPhoto * self; Alteration* _tmp0_; Alteration* _tmp1_; -#line 5252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5271 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = alteration_new ("metadata", "flagged"); -#line 5253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 5253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5272 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_); -#line 5253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5272 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp1_); -#line 40175 "Photo.c" +#line 40300 "Photo.c" } @@ -40187,37 +40312,37 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE gboolean _tmp1_; gboolean _tmp3_; GError * _inner_error_ = NULL; -#line 5256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5278 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = DATA_SOURCE_CLASS (library_photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource), &_inner_error_); -#line 5259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5278 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp1_; -#line 5259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5278 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 40194 "Photo.c" +#line 40319 "Photo.c" gboolean _tmp2_ = FALSE; -#line 5259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5278 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5278 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp2_; -#line 40200 "Photo.c" +#line 40325 "Photo.c" } -#line 5259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5278 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp0_) { -#line 5260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5279 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 5260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5279 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40208 "Photo.c" +#line 40333 "Photo.c" } -#line 5262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5281 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 5262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5281 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40216 "Photo.c" +#line 40341 "Photo.c" } @@ -40226,76 +40351,76 @@ static void library_photo_real_destroy (DataSource* base) { PhotoID photo_id = {0}; PhotoID _tmp0_ = {0}; GError * _inner_error_ = NULL; -#line 5265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5284 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), &_tmp0_); -#line 5266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" photo_id = _tmp0_; -#line 5269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5288 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 40233 "Photo.c" +#line 40358 "Photo.c" { PhotoTable* _tmp1_; PhotoTable* _tmp2_; PhotoID _tmp3_; -#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_id; -#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_remove (_tmp2_, &_tmp3_, &_inner_error_); -#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 40252 "Photo.c" - goto __catch410_database_error; +#line 40377 "Photo.c" + goto __catch422_database_error; } -#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40261 "Photo.c" +#line 40386 "Photo.c" } } - goto __finally410; - __catch410_database_error: + goto __finally422; + __catch422_database_error: { GError* err = NULL; GError* _tmp4_; -#line 5274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 5274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 5277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = err; -#line 5277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" app_window_database_error (_tmp4_); -#line 5274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 40279 "Photo.c" +#line 40404 "Photo.c" } - __finally410: -#line 5274 "/home/jens/Source/shotwell/src/Photo.vala" + __finally422: +#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5293 "/home/jens/Source/shotwell/src/Photo.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 5274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 5274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40290 "Photo.c" +#line 40415 "Photo.c" } -#line 5280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5299 "/home/jens/Source/shotwell/src/Photo.vala" DATA_SOURCE_CLASS (library_photo_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource)); -#line 40294 "Photo.c" +#line 40419 "Photo.c" } @@ -40307,25 +40432,25 @@ gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbna PhotoFileFormat _tmp3_; PhotoID _tmp4_ = {0}; gboolean _tmp5_; -#line 5283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5302 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); -#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file; -#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = thumbnail_md5; -#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = full_md5; -#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file_format; -#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_get_nontrash_duplicate (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_); -#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_id_is_valid (&_tmp4_); -#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40324 "Photo.c" +#line 40449 "Photo.c" } @@ -40345,79 +40470,79 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m PhotoID* _tmp10_; gint _tmp10__length1; PhotoID _tmp18_ = {0}; -#line 5288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((file == NULL) || G_IS_FILE (file)); -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file; -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = thumbnail_md5; -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = full_md5; -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file_format; -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_get_duplicate_ids (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_); -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" ids = _tmp5_; -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" ids_length1 = _tmp4_; -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _ids_size_ = ids_length1; -#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = ids; -#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7__length1 = ids_length1; -#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_ == NULL) { -#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = TRUE; -#line 40370 "Photo.c" +#line 40495 "Photo.c" } else { PhotoID* _tmp8_; gint _tmp8__length1; -#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = ids; -#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8__length1 = ids_length1; -#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp8__length1 == 0; -#line 40380 "Photo.c" +#line 40505 "Photo.c" } -#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 40384 "Photo.c" +#line 40509 "Photo.c" PhotoID _tmp9_ = {0}; -#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" photo_id_init (&_tmp9_, PHOTO_ID_INVALID); -#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp9_; -#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" ids = (g_free (ids), NULL); -#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40394 "Photo.c" +#line 40519 "Photo.c" } -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = ids; -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10__length1 = ids_length1; -#line 40400 "Photo.c" +#line 40525 "Photo.c" { PhotoID* id_collection = NULL; gint id_collection_length1 = 0; gint _id_collection_size_ = 0; gint id_it = 0; -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" id_collection = _tmp10_; -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" id_collection_length1 = _tmp10__length1; -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) { -#line 40412 "Photo.c" +#line 40537 "Photo.c" PhotoID id = {0}; -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" id = id_collection[id_it]; -#line 40416 "Photo.c" +#line 40541 "Photo.c" { LibraryPhoto* photo = NULL; LibraryPhotoSourceCollection* _tmp11_; @@ -40425,60 +40550,60 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m LibraryPhoto* _tmp13_; gboolean _tmp14_ = FALSE; LibraryPhoto* _tmp15_; -#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = library_photo_global; -#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = id; -#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = library_photo_source_collection_fetch (_tmp11_, &_tmp12_); -#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp13_; -#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo; -#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_ != NULL) { -#line 40436 "Photo.c" +#line 40561 "Photo.c" LibraryPhoto* _tmp16_; gboolean _tmp17_; -#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo; -#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = !_tmp17_; -#line 40445 "Photo.c" +#line 40570 "Photo.c" } else { -#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = FALSE; -#line 40449 "Photo.c" +#line 40574 "Photo.c" } -#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_) { -#line 5298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5317 "/home/jens/Source/shotwell/src/Photo.vala" *result = id; -#line 5298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5317 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 5298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5317 "/home/jens/Source/shotwell/src/Photo.vala" ids = (g_free (ids), NULL); -#line 5298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5317 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40461 "Photo.c" +#line 40586 "Photo.c" } -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 40465 "Photo.c" +#line 40590 "Photo.c" } } } -#line 5301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" photo_id_init (&_tmp18_, PHOTO_ID_INVALID); -#line 5301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp18_; -#line 5301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" ids = (g_free (ids), NULL); -#line 5301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40477 "Photo.c" +#line 40602 "Photo.c" } @@ -40507,179 +40632,179 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { gint _tmp27_; gboolean _tmp28_ = FALSE; GeeList* _tmp29_; -#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = tag_global; -#line 5305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = tag_source_collection_fetch_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" tags = _tmp1_; -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource)); -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5326 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp2_; -#line 5308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5327 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = metadata; -#line 5308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5327 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ == NULL) { -#line 40522 "Photo.c" +#line 40647 "Photo.c" gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; GeeList* _tmp6_; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = tags; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != NULL) { -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = TRUE; -#line 40532 "Photo.c" +#line 40657 "Photo.c" } else { GeeList* _tmp7_; gint _tmp8_; gint _tmp9_; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = tags; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp9_ > 0; -#line 40545 "Photo.c" +#line 40670 "Photo.c" } -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = TRUE; -#line 40551 "Photo.c" +#line 40676 "Photo.c" } else { Rating _tmp10_; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp10_ != RATING_UNRATED; -#line 40558 "Photo.c" +#line 40683 "Photo.c" } -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tags); -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40568 "Photo.c" +#line 40693 "Photo.c" } -#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5330 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5330 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = metadata; -#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5330 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_metadata_get_rating (_tmp12_); -#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5330 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_ != _tmp13_) { -#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5331 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5331 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5331 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tags); -#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5331 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40586 "Photo.c" +#line 40711 "Photo.c" } -#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = metadata; -#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_metadata_get_keywords (_tmp14_, NULL, NULL, NULL); -#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" keywords = _tmp15_; -#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = tags; -#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_ != NULL) { -#line 40598 "Photo.c" +#line 40723 "Photo.c" GeeList* _tmp18_; gint _tmp19_; gint _tmp20_; -#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = tags; -#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp20_; -#line 40610 "Photo.c" +#line 40735 "Photo.c" } else { -#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = 0; -#line 40614 "Photo.c" +#line 40739 "Photo.c" } -#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" tags_count = _tmp16_; -#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = keywords; -#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_ != NULL) { -#line 40622 "Photo.c" +#line 40747 "Photo.c" GeeSet* _tmp23_; gint _tmp24_; gint _tmp25_; -#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = keywords; -#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_; -#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp25_; -#line 40634 "Photo.c" +#line 40759 "Photo.c" } else { -#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = 0; -#line 40638 "Photo.c" +#line 40763 "Photo.c" } -#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" keywords_count = _tmp21_; -#line 5318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5337 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = tags_count; -#line 5318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5337 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = keywords_count; -#line 5318 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5337 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp26_ != _tmp27_) { -#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5338 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5338 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (keywords); -#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5338 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5338 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tags); -#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5338 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40658 "Photo.c" +#line 40783 "Photo.c" } -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = tags; -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5340 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_ != NULL) { -#line 40664 "Photo.c" +#line 40789 "Photo.c" GeeSet* _tmp30_; -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = keywords; -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp30_ != NULL; -#line 40670 "Photo.c" +#line 40795 "Photo.c" } else { -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = FALSE; -#line 40674 "Photo.c" +#line 40799 "Photo.c" } -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5340 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_) { -#line 40678 "Photo.c" +#line 40803 "Photo.c" { GeeList* _tag_list = NULL; GeeList* _tmp31_; @@ -40689,25 +40814,25 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { gint _tmp34_; gint _tmp35_; gint _tag_index = 0; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = tags; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _g_object_ref0 (_tmp31_); -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tag_list = _tmp32_; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tag_list; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tag_size = _tmp35_; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tag_index = -1; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40706 "Photo.c" +#line 40831 "Photo.c" gint _tmp36_; gint _tmp37_; gint _tmp38_; @@ -40723,86 +40848,86 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { gchar* _tmp47_; gboolean _tmp48_; gboolean _tmp49_; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = _tag_index; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tag_index = _tmp36_ + 1; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tag_index; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tag_size; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp37_ < _tmp38_)) { -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 40734 "Photo.c" +#line 40859 "Photo.c" } -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tag_list; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = _tag_index; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = gee_list_get (_tmp39_, _tmp40_); -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" tag = (Tag*) _tmp41_; -#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = keywords; -#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = tag; -#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_OBJECT, DataObject)); -#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp44_; -#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = g_utf8_normalize (_tmp45_, (gssize) -1, G_NORMALIZE_DEFAULT); -#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _tmp46_; -#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection), _tmp47_); -#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = !_tmp48_; -#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp47_); -#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp45_); -#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_) { -#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5343 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5343 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5343 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_list); -#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5343 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (keywords); -#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5343 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5343 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tags); -#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5343 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40780 "Photo.c" +#line 40905 "Photo.c" } -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 40784 "Photo.c" +#line 40909 "Photo.c" } -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_list); -#line 40788 "Photo.c" +#line 40913 "Photo.c" } } -#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5347 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5347 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (keywords); -#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5347 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5347 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tags); -#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5347 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40801 "Photo.c" +#line 40926 "Photo.c" } @@ -40814,30 +40939,30 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM GeeList* _tmp2_; PhotoMetadata* _tmp22_; Rating _tmp23_; -#line 5331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5350 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5350 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); -#line 5332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5351 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = tag_global; -#line 5332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5351 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = tag_source_collection_fetch_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5351 "/home/jens/Source/shotwell/src/Photo.vala" photo_tags = _tmp1_; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5352 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_tags; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5352 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 40827 "Photo.c" +#line 40952 "Photo.c" GeeCollection* string_tags = NULL; GeeArrayList* _tmp3_; PhotoMetadata* _tmp19_; GeeCollection* _tmp20_; -#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); -#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" string_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 40836 "Photo.c" +#line 40961 "Photo.c" { GeeList* _tag_list = NULL; GeeList* _tmp4_; @@ -40847,25 +40972,25 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM gint _tmp7_; gint _tmp8_; gint _tag_index = 0; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_tags; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tag_list = _tmp5_; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tag_list; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tag_size = _tmp8_; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tag_index = -1; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40864 "Photo.c" +#line 40989 "Photo.c" gint _tmp9_; gint _tmp10_; gint _tmp11_; @@ -40877,74 +41002,74 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM Tag* _tmp16_; gchar* _tmp17_; gchar* _tmp18_; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tag_index; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tag_index = _tmp9_ + 1; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tag_index; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tag_size; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp10_ < _tmp11_)) { -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 40888 "Photo.c" +#line 41013 "Photo.c" } -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tag_list; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tag_index; -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = gee_list_get (_tmp12_, _tmp13_); -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" tag = (Tag*) _tmp14_; -#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = string_tags; -#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = tag; -#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); -#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_; -#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" gee_collection_add (_tmp15_, _tmp18_); -#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp18_); -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 40912 "Photo.c" +#line 41037 "Photo.c" } -#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_list); -#line 40916 "Photo.c" +#line 41041 "Photo.c" } -#line 5338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5357 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = metadata; -#line 5338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5357 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = string_tags; -#line 5338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5357 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_keywords (_tmp19_, _tmp20_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5352 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (string_tags); -#line 40926 "Photo.c" +#line 41051 "Photo.c" } else { PhotoMetadata* _tmp21_; -#line 5340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5359 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = metadata; -#line 5340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5359 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_keywords (_tmp21_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 40933 "Photo.c" +#line 41058 "Photo.c" } -#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5361 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = metadata; -#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5361 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5361 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_rating (_tmp22_, _tmp23_); -#line 5331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5350 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo_tags); -#line 40943 "Photo.c" +#line 41068 "Photo.c" } @@ -40958,63 +41083,63 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph GeeSet* _tmp7_; GeeCollection* _tmp8_; HierarchicalTagIndex* _tmp39_; -#line 5345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); -#line 5346 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5365 "/home/jens/Source/shotwell/src/Photo.vala" new_htag_index = NULL; -#line 5348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5367 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = metadata; -#line 5348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5367 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_metadata_has_hierarchical_keywords (_tmp0_); -#line 5348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5367 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 40969 "Photo.c" +#line 41094 "Photo.c" PhotoMetadata* _tmp2_; GeeSet* _tmp3_; GeeSet* _tmp4_; HierarchicalTagIndex* _tmp5_; -#line 5349 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 5349 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_metadata_get_hierarchical_keywords (_tmp2_); -#line 5349 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 5349 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5349 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (new_htag_index); -#line 5349 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" new_htag_index = _tmp5_; -#line 5349 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 40988 "Photo.c" +#line 41113 "Photo.c" } -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5372 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = metadata; -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5372 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_metadata_get_keywords (_tmp6_, NULL, NULL, NULL); -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5372 "/home/jens/Source/shotwell/src/Photo.vala" keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection); -#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = keywords; -#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5373 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 41000 "Photo.c" +#line 41125 "Photo.c" { GeeIterator* _keyword_it = NULL; GeeCollection* _tmp9_; GeeIterator* _tmp10_; -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = keywords; -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _keyword_it = _tmp10_; -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41013 "Photo.c" +#line 41138 "Photo.c" GeeIterator* _tmp11_; gboolean _tmp12_; gchar* keyword = NULL; @@ -41037,156 +41162,156 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph const gchar* _tmp36_; Tag* _tmp37_; Tag* _tmp38_; -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _keyword_it; -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = gee_iterator_next (_tmp11_); -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp12_) { -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41044 "Photo.c" +#line 41169 "Photo.c" } -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _keyword_it; -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = gee_iterator_get (_tmp13_); -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" keyword = (gchar*) _tmp14_; -#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5375 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = new_htag_index; -#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5375 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_ != NULL) { -#line 41056 "Photo.c" +#line 41181 "Photo.c" HierarchicalTagIndex* _tmp17_; const gchar* _tmp18_; gboolean _tmp19_; -#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5375 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = new_htag_index; -#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5375 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = keyword; -#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5375 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = hierarchical_tag_index_is_tag_in_index (_tmp17_, _tmp18_); -#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5375 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp19_; -#line 41068 "Photo.c" +#line 41193 "Photo.c" } else { -#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5375 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = FALSE; -#line 41072 "Photo.c" +#line 41197 "Photo.c" } -#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5375 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 5357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 5357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41080 "Photo.c" +#line 41205 "Photo.c" } -#line 5359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = keyword; -#line 5359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp20_); -#line 5359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" safe_keyword = _tmp21_; -#line 5360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5379 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = safe_keyword; -#line 5360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5379 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp22_); -#line 5360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5379 "/home/jens/Source/shotwell/src/Photo.vala" promoted_keyword = _tmp23_; -#line 5363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = tag_global; -#line 5363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = safe_keyword; -#line 5363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = tag_source_collection_exists (_tmp24_, _tmp25_, FALSE); -#line 5363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5382 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp26_) { -#line 41102 "Photo.c" +#line 41227 "Photo.c" const gchar* _tmp27_; Tag* _tmp28_; Tag* _tmp29_; -#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = safe_keyword; -#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = tag_for_path (_tmp27_); -#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp28_; -#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5383 "/home/jens/Source/shotwell/src/Photo.vala" tag_attach (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5383 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp29_); -#line 5365 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5384 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (promoted_keyword); -#line 5365 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5384 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (safe_keyword); -#line 5365 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5384 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 5365 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5384 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41124 "Photo.c" +#line 41249 "Photo.c" } -#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5387 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = tag_global; -#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5387 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = promoted_keyword; -#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5387 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = tag_source_collection_exists (_tmp30_, _tmp31_, FALSE); -#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5387 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp32_) { -#line 41134 "Photo.c" +#line 41259 "Photo.c" const gchar* _tmp33_; Tag* _tmp34_; Tag* _tmp35_; -#line 5369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5388 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = promoted_keyword; -#line 5369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5388 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = tag_for_path (_tmp33_); -#line 5369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5388 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_; -#line 5369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5388 "/home/jens/Source/shotwell/src/Photo.vala" tag_attach (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5388 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp35_); -#line 5370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5389 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (promoted_keyword); -#line 5370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5389 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (safe_keyword); -#line 5370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5389 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 5370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5389 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41156 "Photo.c" +#line 41281 "Photo.c" } -#line 5373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = keyword; -#line 5373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = tag_for_path (_tmp36_); -#line 5373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp37_; -#line 5373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5392 "/home/jens/Source/shotwell/src/Photo.vala" tag_attach (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5392 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp38_); -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (promoted_keyword); -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (safe_keyword); -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 41174 "Photo.c" +#line 41299 "Photo.c" } -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_keyword_it); -#line 41178 "Photo.c" +#line 41303 "Photo.c" } } -#line 5377 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5396 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = new_htag_index; -#line 5377 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5396 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp39_ != NULL) { -#line 41185 "Photo.c" +#line 41310 "Photo.c" { GeeIterator* _path_it = NULL; HierarchicalTagIndex* _tmp40_; @@ -41194,23 +41319,23 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph GeeCollection* _tmp42_; GeeIterator* _tmp43_; GeeIterator* _tmp44_; -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = new_htag_index; -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = hierarchical_tag_index_get_all_paths (_tmp40_); -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_; -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp43_; -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp42_); -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _path_it = _tmp44_; -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41209 "Photo.c" +#line 41334 "Photo.c" GeeIterator* _tmp45_; gboolean _tmp46_; gchar* path = NULL; @@ -41219,150 +41344,150 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph const gchar* _tmp49_; Tag* _tmp50_; Tag* _tmp51_; -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _path_it; -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = gee_iterator_next (_tmp45_); -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp46_) { -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41226 "Photo.c" +#line 41351 "Photo.c" } -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _path_it; -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = gee_iterator_get (_tmp47_); -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" path = (gchar*) _tmp48_; -#line 5379 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5398 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = path; -#line 5379 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5398 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = tag_for_path (_tmp49_); -#line 5379 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5398 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = _tmp50_; -#line 5379 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5398 "/home/jens/Source/shotwell/src/Photo.vala" tag_attach (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5379 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5398 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp51_); -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (path); -#line 41246 "Photo.c" +#line 41371 "Photo.c" } -#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_path_it); -#line 41250 "Photo.c" +#line 41375 "Photo.c" } } -#line 5345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (keywords); -#line 5345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (new_htag_index); -#line 41257 "Photo.c" +#line 41382 "Photo.c" } static void library_photo_class_init (LibraryPhotoClass * klass) { -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_parent_class = g_type_class_peek_parent (klass); -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" g_type_class_add_private (klass, sizeof (LibraryPhotoPrivate)); -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->notify_master_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_master_reimported; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->notify_editable_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_editable_reimported; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->notify_source_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_source_reimported; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->notify_baseline_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_baseline_reimported; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) library_photo_real_notify_altered; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*) (MediaSource *, Scaling*, GError**)) library_photo_real_get_preview_pixbuf; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->rotate = (void (*) (Photo *, Rotation)) library_photo_real_rotate; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) library_photo_real_get_thumbnail; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->is_trashed = (gboolean (*) (MediaSource *)) library_photo_real_is_trashed; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->trash = (void (*) (MediaSource *)) library_photo_real_trash; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->untrash = (void (*) (MediaSource *)) library_photo_real_untrash; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->is_offline = (gboolean (*) (MediaSource *)) library_photo_real_is_offline; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->mark_offline = (void (*) (MediaSource *)) library_photo_real_mark_offline; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->mark_online = (void (*) (MediaSource *)) library_photo_real_mark_online; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) library_photo_real_internal_delete_backing; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) library_photo_real_destroy; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*) (Photo *)) library_photo_real_has_user_generated_metadata; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->set_user_metadata_for_export = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_set_user_metadata_for_export; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_apply_user_metadata_for_reimport; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (klass)->finalize = library_photo_finalize; -#line 41306 "Photo.c" +#line 41431 "Photo.c" } static void library_photo_flaggable_interface_init (FlaggableIface * iface) { -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_flaggable_parent_iface = g_type_interface_peek_parent (iface); -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" iface->is_flagged = (gboolean (*) (Flaggable *)) library_photo_real_is_flagged; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" iface->mark_flagged = (void (*) (Flaggable *)) library_photo_real_mark_flagged; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" iface->mark_unflagged = (void (*) (Flaggable *)) library_photo_real_mark_unflagged; -#line 41319 "Photo.c" +#line 41444 "Photo.c" } static void library_photo_monitorable_interface_init (MonitorableIface * iface) { -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_monitorable_parent_iface = g_type_interface_peek_parent (iface); -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" iface->is_offline = (gboolean (*) (Monitorable *)) library_photo_real_is_offline; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" iface->mark_offline = (void (*) (Monitorable *)) library_photo_real_mark_offline; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" iface->mark_online = (void (*) (Monitorable *)) library_photo_real_mark_online; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" iface->set_master_file = (void (*) (Monitorable *, GFile*)) photo_set_master_file; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" iface->set_master_timestamp = (void (*) (Monitorable *, GFileInfo*)) photo_set_master_timestamp; -#line 41336 "Photo.c" +#line 41461 "Photo.c" } static void library_photo_instance_init (LibraryPhoto * self) { -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = LIBRARY_PHOTO_GET_PRIVATE (self); -#line 4957 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4976 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->block_thumbnail_generation = FALSE; -#line 4958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4977 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->thumbnail_scheduler = NULL; -#line 41347 "Photo.c" +#line 41472 "Photo.c" } static void library_photo_finalize (GObject * obj) { LibraryPhoto * self; -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4977 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler); -#line 4959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4978 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); -#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4965 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (library_photo_parent_class)->finalize (obj); -#line 41361 "Photo.c" +#line 41486 "Photo.c" } @@ -41389,30 +41514,30 @@ LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GTyp void* _tmp1__target; GetSourceDatabaseKey _tmp2_; void* _tmp2__target; -#line 5395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5414 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (sources), NULL); -#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = sources; -#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = check_to_keep; -#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1__target = check_to_keep_target; -#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = get_key; -#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2__target = get_key_target; -#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" self = (LibraryPhotoSourceHoldingTank*) media_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target); -#line 5395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5414 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 41404 "Photo.c" +#line 41529 "Photo.c" } LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_new (LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { -#line 5395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5414 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_source_holding_tank_construct (TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target); -#line 41411 "Photo.c" +#line 41536 "Photo.c" } @@ -41426,59 +41551,59 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh GeeHashMap* _tmp4_; GFile* _tmp5_; gpointer _tmp6_; -#line 5400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5419 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self), NULL); -#line 5400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5419 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 5401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5420 "/home/jens/Source/shotwell/src/Photo.vala" ret = NULL; -#line 5402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5421 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->editable_file_map; -#line 5402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5421 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file; -#line 5402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5421 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 5402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5421 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (ret); -#line 5402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5421 "/home/jens/Source/shotwell/src/Photo.vala" ret = (LibraryPhoto*) _tmp2_; -#line 5403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = ret; -#line 5403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5423 "/home/jens/Source/shotwell/src/Photo.vala" result = ret; -#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5423 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 41449 "Photo.c" +#line 41574 "Photo.c" } -#line 5406 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->development_file_map; -#line 5406 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = file; -#line 5406 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); -#line 5406 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" result = (LibraryPhoto*) _tmp6_; -#line 5406 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (ret); -#line 5406 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 41463 "Photo.c" +#line 41588 "Photo.c" } static void _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) { -#line 5430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5449 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_on_editable_replaced ((LibraryPhotoSourceHoldingTank*) self, _sender, old_file, new_file); -#line 41470 "Photo.c" +#line 41595 "Photo.c" } static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) { -#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5450 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_on_raw_development_modified ((LibraryPhotoSourceHoldingTank*) self, _sender); -#line 41477 "Photo.c" +#line 41602 "Photo.c" } @@ -41488,30 +41613,30 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour GeeCollection* _tmp40_; GeeCollection* _tmp81_; GeeCollection* _tmp82_; -#line 5409 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5428 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); -#line 5409 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5428 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 5409 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5428 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 5411 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5430 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = added; -#line 5411 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5430 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 41497 "Photo.c" +#line 41622 "Photo.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp1_; GeeIterator* _tmp2_; -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = added; -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _source_it = _tmp2_; -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41510 "Photo.c" +#line 41635 "Photo.c" GeeIterator* _tmp3_; gboolean _tmp4_; DataSource* source = NULL; @@ -41530,41 +41655,41 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour GeeCollection* _tmp25_; LibraryPhoto* _tmp38_; LibraryPhoto* _tmp39_; -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _source_it; -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp4_) { -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41537 "Photo.c" +#line 41662 "Photo.c" } -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _source_it; -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" source = (DataSource*) _tmp6_; -#line 5413 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5432 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = source; -#line 5413 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5432 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 5413 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5432 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp8_; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5435 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5435 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo)); -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5435 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5435 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_ != NULL; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5435 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp11_); -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5435 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 41563 "Photo.c" +#line 41688 "Photo.c" GeeHashMap* _tmp13_; LibraryPhoto* _tmp14_; GFile* _tmp15_; @@ -41575,60 +41700,60 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour LibraryPhoto* _tmp20_; GFile* _tmp21_; GFile* _tmp22_; -#line 5417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->editable_file_map; -#line 5417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo; -#line 5417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo)); -#line 5417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 5417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo; -#line 5417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, _tmp17_); -#line 5417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp16_); -#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->priv->reverse_editable_file_map; -#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = photo; -#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo; -#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); -#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_; -#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp18_, _tmp19_, _tmp22_); -#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp22_); -#line 41602 "Photo.c" +#line 41727 "Photo.c" } -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo; -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo)); -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" raw_files = _tmp24_; -#line 5423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5442 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = raw_files; -#line 5423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5442 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp25_ != NULL) { -#line 41614 "Photo.c" +#line 41739 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp26_; GeeIterator* _tmp27_; -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = raw_files; -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp27_; -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41627 "Photo.c" +#line 41752 "Photo.c" GeeIterator* _tmp28_; gboolean _tmp29_; GFile* f = NULL; @@ -41640,86 +41765,86 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour GeeMultiMap* _tmp35_; LibraryPhoto* _tmp36_; GFile* _tmp37_; -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _f_it; -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = gee_iterator_next (_tmp28_); -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp29_) { -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41647 "Photo.c" +#line 41772 "Photo.c" } -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _f_it; -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = gee_iterator_get (_tmp30_); -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp31_; -#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = self->priv->development_file_map; -#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = f; -#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = photo; -#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5444 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_); -#line 5426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = self->priv->reverse_development_file_map; -#line 5426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = photo; -#line 5426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = f; -#line 5426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5445 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp35_, _tmp36_, _tmp37_); -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 41673 "Photo.c" +#line 41798 "Photo.c" } -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 41677 "Photo.c" +#line 41802 "Photo.c" } } -#line 5430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5449 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = photo; -#line 5430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5449 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self); -#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5450 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = photo; -#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5450 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self); -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_files); -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (source); -#line 41694 "Photo.c" +#line 41819 "Photo.c" } -#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_source_it); -#line 41698 "Photo.c" +#line 41823 "Photo.c" } } -#line 5435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5454 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = removed; -#line 5435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5454 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp40_ != NULL) { -#line 41705 "Photo.c" +#line 41830 "Photo.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp41_; GeeIterator* _tmp42_; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = removed; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _source_it = _tmp42_; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41718 "Photo.c" +#line 41843 "Photo.c" GeeIterator* _tmp43_; gboolean _tmp44_; DataSource* source = NULL; @@ -41736,29 +41861,29 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour guint _tmp78_; LibraryPhoto* _tmp79_; guint _tmp80_; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _source_it; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = gee_iterator_next (_tmp43_); -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp44_) { -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41743 "Photo.c" +#line 41868 "Photo.c" } -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _source_it; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = gee_iterator_get (_tmp45_); -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" source = (DataSource*) _tmp46_; -#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5456 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = source; -#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5456 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5456 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp48_; -#line 41757 "Photo.c" +#line 41882 "Photo.c" { GeeIterator* _f_it = NULL; GeeMultiMap* _tmp49_; @@ -41767,25 +41892,25 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour GeeCollection* _tmp52_; GeeIterator* _tmp53_; GeeIterator* _tmp54_; -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = self->priv->reverse_editable_file_map; -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = photo; -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = gee_multi_map_get (_tmp49_, _tmp50_); -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = _tmp51_; -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = _tmp53_; -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp52_); -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp54_; -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41784 "Photo.c" +#line 41909 "Photo.c" GeeIterator* _tmp55_; gboolean _tmp56_; GFile* f = NULL; @@ -41793,35 +41918,35 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour gpointer _tmp58_; GeeHashMap* _tmp59_; GFile* _tmp60_; -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _f_it; -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = gee_iterator_next (_tmp55_); -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp56_) { -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41800 "Photo.c" +#line 41925 "Photo.c" } -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = _f_it; -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = gee_iterator_get (_tmp57_); -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp58_; -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5458 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = self->priv->editable_file_map; -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5458 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = f; -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5458 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, NULL); -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 41816 "Photo.c" +#line 41941 "Photo.c" } -#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 41820 "Photo.c" +#line 41945 "Photo.c" } { GeeIterator* _f_it = NULL; @@ -41831,25 +41956,25 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour GeeCollection* _tmp64_; GeeIterator* _tmp65_; GeeIterator* _tmp66_; -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = self->priv->reverse_development_file_map; -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = photo; -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = gee_multi_map_get (_tmp61_, _tmp62_); -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = _tmp63_; -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = _tmp65_; -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp64_); -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp66_; -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41848 "Photo.c" +#line 41973 "Photo.c" GeeIterator* _tmp67_; gboolean _tmp68_; GFile* f = NULL; @@ -41857,78 +41982,78 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour gpointer _tmp70_; GeeHashMap* _tmp71_; GFile* _tmp72_; -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = _f_it; -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = gee_iterator_next (_tmp67_); -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp68_) { -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41864 "Photo.c" +#line 41989 "Photo.c" } -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = _f_it; -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = gee_iterator_get (_tmp69_); -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp70_; -#line 5442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = self->priv->development_file_map; -#line 5442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = f; -#line 5442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5461 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_, NULL); -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 41880 "Photo.c" +#line 42005 "Photo.c" } -#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 41884 "Photo.c" +#line 42009 "Photo.c" } -#line 5444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5463 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = self->priv->reverse_editable_file_map; -#line 5444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5463 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = photo; -#line 5444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5463 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove_all (_tmp73_, _tmp74_); -#line 5445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = self->priv->reverse_development_file_map; -#line 5445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = photo; -#line 5445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5464 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove_all (_tmp75_, _tmp76_); -#line 5447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = photo; -#line 5447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5466 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp78_, NULL, FALSE); -#line 5447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5466 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp78_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self); -#line 5448 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = photo; -#line 5448 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5467 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp80_, NULL, FALSE); -#line 5448 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5467 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp80_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self); -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (source); -#line 41914 "Photo.c" +#line 42039 "Photo.c" } -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_source_it); -#line 41918 "Photo.c" +#line 42043 "Photo.c" } } -#line 5452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = added; -#line 5452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = removed; -#line 5452 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5471 "/home/jens/Source/shotwell/src/Photo.vala" SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp81_, _tmp82_); -#line 41927 "Photo.c" +#line 42052 "Photo.c" } @@ -41942,79 +42067,79 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto GeeMultiMap* _tmp13_; LibraryPhoto* _tmp14_; GFile* _tmp15_; -#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self)); -#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (_photo)); -#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file)); -#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file)); -#line 5456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _photo; -#line 5456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL); -#line 5456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp1_; -#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5476 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo; -#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5476 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp2_ != NULL, "photo != null"); -#line 5459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5478 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = old_file; -#line 5459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5478 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 41963 "Photo.c" +#line 42088 "Photo.c" GeeHashMap* _tmp4_; GFile* _tmp5_; GeeMultiMap* _tmp6_; LibraryPhoto* _tmp7_; GFile* _tmp8_; -#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->editable_file_map; -#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = old_file; -#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5479 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, NULL); -#line 5461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->reverse_editable_file_map; -#line 5461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo; -#line 5461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = old_file; -#line 5461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5480 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp6_, _tmp7_, _tmp8_); -#line 41983 "Photo.c" +#line 42108 "Photo.c" } -#line 5464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = new_file; -#line 5464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp9_ != NULL) { -#line 41989 "Photo.c" +#line 42114 "Photo.c" GeeHashMap* _tmp10_; GFile* _tmp11_; LibraryPhoto* _tmp12_; -#line 5465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5484 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->priv->editable_file_map; -#line 5465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5484 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = new_file; -#line 5465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5484 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo; -#line 5465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5484 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_); -#line 42001 "Photo.c" +#line 42126 "Photo.c" } -#line 5466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->reverse_editable_file_map; -#line 5466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo; -#line 5466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = new_file; -#line 5466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp13_, _tmp14_, _tmp15_); -#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 42013 "Photo.c" +#line 42138 "Photo.c" } @@ -42030,29 +42155,29 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra LibraryPhoto* _tmp20_; GeeCollection* _tmp21_; GeeCollection* _tmp22_; -#line 5469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5488 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self)); -#line 5469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5488 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (_photo)); -#line 5470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5489 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _photo; -#line 5470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5489 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL); -#line 5470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5489 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp1_; -#line 5471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5490 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo; -#line 5471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5490 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp2_ != NULL, "photo != null"); -#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5493 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->reverse_development_file_map; -#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5493 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo; -#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5493 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_); -#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5493 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 42051 "Photo.c" +#line 42176 "Photo.c" GeeMultiMap* _tmp18_; LibraryPhoto* _tmp19_; { @@ -42063,25 +42188,25 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra GeeCollection* _tmp9_; GeeIterator* _tmp10_; GeeIterator* _tmp11_; -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->reverse_development_file_map; -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo; -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_); -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp9_); -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp11_; -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 42080 "Photo.c" +#line 42205 "Photo.c" GeeIterator* _tmp12_; gboolean _tmp13_; GFile* f = NULL; @@ -42089,68 +42214,68 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra gpointer _tmp15_; GeeHashMap* _tmp16_; GFile* _tmp17_; -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _f_it; -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = gee_iterator_next (_tmp12_); -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp13_) { -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 42096 "Photo.c" +#line 42221 "Photo.c" } -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _f_it; -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = gee_iterator_get (_tmp14_); -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp15_; -#line 5476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5495 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->development_file_map; -#line 5476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5495 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = f; -#line 5476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5495 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL); -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 42112 "Photo.c" +#line 42237 "Photo.c" } -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 42116 "Photo.c" +#line 42241 "Photo.c" } -#line 5477 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5496 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->priv->reverse_development_file_map; -#line 5477 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5496 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = photo; -#line 5477 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5496 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove_all (_tmp18_, _tmp19_); -#line 42124 "Photo.c" +#line 42249 "Photo.c" } -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5500 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo; -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5500 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5500 "/home/jens/Source/shotwell/src/Photo.vala" raw_list = _tmp21_; -#line 5482 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5501 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = raw_list; -#line 5482 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5501 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_ != NULL) { -#line 42136 "Photo.c" +#line 42261 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp23_; GeeIterator* _tmp24_; -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = raw_list; -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp24_; -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 42149 "Photo.c" +#line 42274 "Photo.c" GeeIterator* _tmp25_; gboolean _tmp26_; GFile* f = NULL; @@ -42162,65 +42287,65 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra GeeMultiMap* _tmp32_; LibraryPhoto* _tmp33_; GFile* _tmp34_; -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _f_it; -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = gee_iterator_next (_tmp25_); -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp26_) { -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 42169 "Photo.c" +#line 42294 "Photo.c" } -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _f_it; -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = gee_iterator_get (_tmp27_); -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp28_; -#line 5484 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5503 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = self->priv->development_file_map; -#line 5484 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5503 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = f; -#line 5484 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5503 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = photo; -#line 5484 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5503 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_, _tmp31_); -#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5504 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = self->priv->reverse_development_file_map; -#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5504 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = photo; -#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5504 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = f; -#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5504 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp32_, _tmp33_, _tmp34_); -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 42195 "Photo.c" +#line 42320 "Photo.c" } -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 42199 "Photo.c" +#line 42324 "Photo.c" } } -#line 5469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5488 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_list); -#line 5469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5488 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 42206 "Photo.c" +#line 42331 "Photo.c" } static void library_photo_source_holding_tank_class_init (LibraryPhotoSourceHoldingTankClass * klass) { -#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_parent_class = g_type_class_peek_parent (klass); -#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" ((SourceHoldingTankClass *) klass)->finalize = library_photo_source_holding_tank_finalize; -#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" g_type_class_add_private (klass, sizeof (LibraryPhotoSourceHoldingTankPrivate)); -#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) library_photo_source_holding_tank_real_notify_contents_altered; -#line 42219 "Photo.c" +#line 42344 "Photo.c" } @@ -42229,43 +42354,43 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH GeeHashMap* _tmp1_; GeeHashMultiMap* _tmp2_; GeeHashMultiMap* _tmp3_; -#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE (self); -#line 5386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5405 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); -#line 5386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5405 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->editable_file_map = _tmp0_; -#line 5388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5407 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); -#line 5388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5407 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->development_file_map = _tmp1_; -#line 5390 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5409 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); -#line 5390 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5409 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->reverse_editable_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 5392 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5411 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); -#line 5392 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5411 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->reverse_development_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 42246 "Photo.c" +#line 42371 "Photo.c" } static void library_photo_source_holding_tank_finalize (SourceHoldingTank * obj) { LibraryPhotoSourceHoldingTank * self; -#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); -#line 5386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5405 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->editable_file_map); -#line 5388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5407 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->development_file_map); -#line 5390 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5409 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->reverse_editable_file_map); -#line 5392 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5411 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->reverse_development_file_map); -#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->finalize (obj); -#line 42264 "Photo.c" +#line 42389 "Photo.c" } |