From 3253d99365813f2d2ffd05e10cbb8c11f53d746e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 22 Mar 2017 06:39:17 +0100 Subject: New upstream version 0.26.0 --- src/Photo.c | 28259 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 14137 insertions(+), 14122 deletions(-) (limited to 'src/Photo.c') diff --git a/src/Photo.c b/src/Photo.c index 17e0e5d..b890199 100644 --- a/src/Photo.c +++ b/src/Photo.c @@ -483,6 +483,8 @@ typedef struct _MetadataDateTime MetadataDateTime; typedef struct _MetadataDateTimeClass MetadataDateTimeClass; #define _metadata_date_time_unref0(var) ((var == NULL) ? NULL : (var = (metadata_date_time_unref (var), NULL))) +#define PHOTO_FILE_READER_TYPE_ROLE (photo_file_reader_role_get_type ()) + #define PHOTO_TYPE_REIMPORT_MASTER_STATE (photo_reimport_master_state_get_type ()) #define PHOTO_REIMPORT_MASTER_STATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState)) #define PHOTO_REIMPORT_MASTER_STATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterStateClass)) @@ -1317,6 +1319,11 @@ typedef enum { IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE } ImportResult; +typedef enum { + PHOTO_FILE_READER_ROLE_DEFAULT, + PHOTO_FILE_READER_ROLE_THUMBNAIL +} PhotoFileReaderRole; + struct _PhotoReimportMasterState { GTypeInstance parent_instance; volatile int ref_count; @@ -2069,8 +2076,8 @@ void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, P 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); -GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error); 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); void photo_discard_prefetched (Photo* self); RawDeveloper photo_get_raw_developer (Photo* self); @@ -2138,6 +2145,8 @@ Rating photo_metadata_get_rating (PhotoMetadata* self); void photo_id_init (PhotoID *self, gint64 id); #define EVENT_ID_INVALID ((gint64) -1) void event_id_init (EventID *self, gint64 id); +GType photo_file_reader_role_get_type (void) G_GNUC_CONST; +void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role); void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader* reader, Orientation orientation, Dimensions* original_dim, GError** error); ImportResult import_result_convert_error (GError* err, ImportResult default_result); void photo_create_pre_import (PhotoImportParams* params); @@ -2875,14 +2884,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 2879 "Photo.c" +#line 2888 "Photo.c" } static gpointer _thumbnails_ref0 (gpointer self) { #line 48 "/home/jens/Source/shotwell/src/Photo.vala" return self ? thumbnails_ref (self) : NULL; -#line 2886 "Photo.c" +#line 2895 "Photo.c" } @@ -2970,14 +2979,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 2974 "Photo.c" +#line 2983 "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 2981 "Photo.c" +#line 2990 "Photo.c" } @@ -3024,21 +3033,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 3028 "Photo.c" +#line 3037 "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 3035 "Photo.c" +#line 3044 "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 3042 "Photo.c" +#line 3051 "Photo.c" } @@ -3047,7 +3056,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 3051 "Photo.c" +#line 3060 "Photo.c" } } @@ -3057,11 +3066,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 3061 "Photo.c" +#line 3070 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 3065 "Photo.c" +#line 3074 "Photo.c" } } @@ -3069,37 +3078,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 3073 "Photo.c" +#line 3082 "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 3080 "Photo.c" +#line 3089 "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 3087 "Photo.c" +#line 3096 "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 3091 "Photo.c" +#line 3100 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_import_params_ref (object); -#line 3095 "Photo.c" +#line 3104 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 3099 "Photo.c" +#line 3108 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 3103 "Photo.c" +#line 3112 "Photo.c" } @@ -3110,25 +3119,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 3114 "Photo.c" +#line 3123 "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 3120 "Photo.c" +#line 3129 "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 3124 "Photo.c" +#line 3133 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_import_params_ref (value->data[0].v_pointer); -#line 3128 "Photo.c" +#line 3137 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 3132 "Photo.c" +#line 3141 "Photo.c" } @@ -3142,7 +3151,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 3146 "Photo.c" +#line 3155 "Photo.c" } @@ -3151,7 +3160,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 3155 "Photo.c" +#line 3164 "Photo.c" } @@ -3171,17 +3180,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 3175 "Photo.c" +#line 3184 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 3179 "Photo.c" +#line 3188 "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 3185 "Photo.c" +#line 3194 "Photo.c" } } @@ -3200,17 +3209,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 3204 "Photo.c" +#line 3213 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 3208 "Photo.c" +#line 3217 "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 3214 "Photo.c" +#line 3223 "Photo.c" } } @@ -3220,7 +3229,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 3224 "Photo.c" +#line 3233 "Photo.c" } @@ -3236,7 +3245,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 3240 "Photo.c" +#line 3249 "Photo.c" } @@ -3262,7 +3271,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 3266 "Photo.c" +#line 3275 "Photo.c" } @@ -3287,7 +3296,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 3291 "Photo.c" +#line 3300 "Photo.c" } @@ -3300,7 +3309,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 3304 "Photo.c" +#line 3313 "Photo.c" } } @@ -3311,7 +3320,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 3315 "Photo.c" +#line 3324 "Photo.c" } @@ -3326,14 +3335,14 @@ gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) { result = _tmp0_; #line 76 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3330 "Photo.c" +#line 3339 "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 3337 "Photo.c" +#line 3346 "Photo.c" } @@ -3348,7 +3357,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" 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 3352 "Photo.c" +#line 3361 "Photo.c" } @@ -3357,7 +3366,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 3361 "Photo.c" +#line 3370 "Photo.c" } @@ -3367,7 +3376,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 3371 "Photo.c" +#line 3380 "Photo.c" } @@ -3389,7 +3398,7 @@ gboolean rating_can_increase (Rating self) { result = self < RATING_FIVE; #line 90 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3393 "Photo.c" +#line 3402 "Photo.c" } @@ -3399,7 +3408,7 @@ gboolean rating_can_decrease (Rating self) { result = self > RATING_REJECTED; #line 94 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3403 "Photo.c" +#line 3412 "Photo.c" } @@ -3410,17 +3419,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 3414 "Photo.c" +#line 3423 "Photo.c" } else { #line 98 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 3418 "Photo.c" +#line 3427 "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 3424 "Photo.c" +#line 3433 "Photo.c" } @@ -3434,17 +3443,17 @@ Rating rating_increase (Rating self) { if (_tmp1_) { #line 102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self + 1; -#line 3438 "Photo.c" +#line 3447 "Photo.c" } else { #line 102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self; -#line 3442 "Photo.c" +#line 3451 "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 3448 "Photo.c" +#line 3457 "Photo.c" } @@ -3458,17 +3467,17 @@ Rating rating_decrease (Rating self) { if (_tmp1_) { #line 106 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self - 1; -#line 3462 "Photo.c" +#line 3471 "Photo.c" } else { #line 106 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self; -#line 3466 "Photo.c" +#line 3475 "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 3472 "Photo.c" +#line 3481 "Photo.c" } @@ -3478,73 +3487,73 @@ gint rating_serialize (Rating self) { switch (self) { #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_REJECTED: -#line 3482 "Photo.c" +#line 3491 "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 3488 "Photo.c" +#line 3497 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_UNRATED: -#line 3492 "Photo.c" +#line 3501 "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 3498 "Photo.c" +#line 3507 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_ONE: -#line 3502 "Photo.c" +#line 3511 "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 3508 "Photo.c" +#line 3517 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_TWO: -#line 3512 "Photo.c" +#line 3521 "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 3518 "Photo.c" +#line 3527 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_THREE: -#line 3522 "Photo.c" +#line 3531 "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 3528 "Photo.c" +#line 3537 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_FOUR: -#line 3532 "Photo.c" +#line 3541 "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 3538 "Photo.c" +#line 3547 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_FIVE: -#line 3542 "Photo.c" +#line 3551 "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 3548 "Photo.c" +#line 3557 "Photo.c" } default: { @@ -3552,7 +3561,7 @@ gint rating_serialize (Rating self) { result = 0; #line 126 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3556 "Photo.c" +#line 3565 "Photo.c" } } } @@ -3570,7 +3579,7 @@ Rating rating_unserialize (gint value) { result = RATING_FIVE; #line 132 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3574 "Photo.c" +#line 3583 "Photo.c" } else { gint _tmp1_ = 0; #line 133 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3581,7 +3590,7 @@ Rating rating_unserialize (gint value) { result = RATING_REJECTED; #line 134 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3585 "Photo.c" +#line 3594 "Photo.c" } } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3590,73 +3599,73 @@ Rating rating_unserialize (gint value) { switch (_tmp2_) { #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case -1: -#line 3594 "Photo.c" +#line 3603 "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 3600 "Photo.c" +#line 3609 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 0: -#line 3604 "Photo.c" +#line 3613 "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 3610 "Photo.c" +#line 3619 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 1: -#line 3614 "Photo.c" +#line 3623 "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 3620 "Photo.c" +#line 3629 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 2: -#line 3624 "Photo.c" +#line 3633 "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 3630 "Photo.c" +#line 3639 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 3: -#line 3634 "Photo.c" +#line 3643 "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 3640 "Photo.c" +#line 3649 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 4: -#line 3644 "Photo.c" +#line 3653 "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 3650 "Photo.c" +#line 3659 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 5: -#line 3654 "Photo.c" +#line 3663 "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 3660 "Photo.c" +#line 3669 "Photo.c" } default: { @@ -3664,7 +3673,7 @@ Rating rating_unserialize (gint value) { result = RATING_UNRATED; #line 152 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3668 "Photo.c" +#line 3677 "Photo.c" } } } @@ -3691,7 +3700,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 3695 "Photo.c" +#line 3704 "Photo.c" } @@ -3704,7 +3713,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 3708 "Photo.c" +#line 3717 "Photo.c" } @@ -3723,14 +3732,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 3727 "Photo.c" +#line 3736 "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 3734 "Photo.c" +#line 3743 "Photo.c" } @@ -3847,7 +3856,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp22_ = basename; #line 412 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_ != NULL) { -#line 3851 "Photo.c" +#line 3860 "Photo.c" const gchar* _tmp23_ = NULL; gchar* _tmp24_ = NULL; #line 413 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3858,7 +3867,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 3862 "Photo.c" +#line 3871 "Photo.c" } #line 415 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->priv->file_title; @@ -3866,7 +3875,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 3870 "Photo.c" +#line 3879 "Photo.c" PhotoRow* _tmp27_ = NULL; BackingPhotoRow* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; @@ -3883,7 +3892,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 3887 "Photo.c" +#line 3896 "Photo.c" } #line 418 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = row; @@ -3893,7 +3902,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 3897 "Photo.c" +#line 3906 "Photo.c" BackingPhotoRow* e = NULL; PhotoRow* _tmp34_ = NULL; BackingPhotoID _tmp35_ = {0}; @@ -3911,7 +3920,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp37_ = e; #line 420 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp37_ != NULL) { -#line 3915 "Photo.c" +#line 3924 "Photo.c" BackingPhotoRow* _tmp38_ = NULL; BackingPhotoRow* _tmp39_ = NULL; PhotoBackingReaders* _tmp40_ = NULL; @@ -3944,7 +3953,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 3948 "Photo.c" +#line 3957 "Photo.c" } else { { PhotoTable* _tmp46_ = NULL; @@ -3964,8 +3973,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 3968 "Photo.c" - goto __catch255_database_error; +#line 3977 "Photo.c" + goto __catch256_database_error; } #line 425 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (e); @@ -3977,11 +3986,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 3981 "Photo.c" +#line 3990 "Photo.c" } } - goto __finally255; - __catch255_database_error: + goto __finally256; + __catch256_database_error: { GError* err = NULL; #line 424 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3990,9 +3999,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 3994 "Photo.c" +#line 4003 "Photo.c" } - __finally255: + __finally256: #line 424 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 424 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4005,15 +4014,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 4009 "Photo.c" +#line 4018 "Photo.c" } #line 432 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 4013 "Photo.c" +#line 4022 "Photo.c" } #line 418 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (e); -#line 4017 "Photo.c" +#line 4026 "Photo.c" } #line 436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = row; @@ -4023,7 +4032,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 4027 "Photo.c" +#line 4036 "Photo.c" GeeHashMap* _tmp52_ = NULL; gint _tmp53_ = 0; RawDeveloper* _tmp54_ = NULL; @@ -4035,7 +4044,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 4039 "Photo.c" +#line 4048 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; @@ -4047,11 +4056,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 4051 "Photo.c" +#line 4060 "Photo.c" RawDeveloper d = 0; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 4055 "Photo.c" +#line 4064 "Photo.c" { BackingPhotoID id = {0}; PhotoRow* _tmp55_ = NULL; @@ -4079,7 +4088,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 4083 "Photo.c" +#line 4092 "Photo.c" BackingPhotoRow* bpr = NULL; BackingPhotoID _tmp61_ = {0}; BackingPhotoRow* _tmp62_ = NULL; @@ -4094,7 +4103,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _tmp63_ = bpr; #line 443 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp63_ != NULL) { -#line 4098 "Photo.c" +#line 4107 "Photo.c" GeeHashMap* _tmp64_ = NULL; RawDeveloper _tmp65_ = 0; BackingPhotoRow* _tmp66_ = NULL; @@ -4106,17 +4115,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 4110 "Photo.c" +#line 4119 "Photo.c" } #line 441 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 4114 "Photo.c" +#line 4123 "Photo.c" } } } #line 439 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 4120 "Photo.c" +#line 4129 "Photo.c" } } #line 450 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4127,7 +4136,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 4131 "Photo.c" +#line 4140 "Photo.c" GeeHashMap* _tmp71_ = NULL; PhotoRow* _tmp72_ = NULL; RawDeveloper _tmp73_ = 0; @@ -4142,15 +4151,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 4146 "Photo.c" +#line 4155 "Photo.c" } else { #line 450 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = FALSE; -#line 4150 "Photo.c" +#line 4159 "Photo.c" } #line 450 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp67_) { -#line 4154 "Photo.c" +#line 4163 "Photo.c" BackingPhotoRow* r = NULL; GeeHashMap* _tmp75_ = NULL; PhotoRow* _tmp76_ = NULL; @@ -4190,7 +4199,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 4194 "Photo.c" +#line 4203 "Photo.c" } #line 456 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = self->priv->readers; @@ -4198,7 +4207,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 4202 "Photo.c" +#line 4211 "Photo.c" BackingPhotoRow* _tmp87_ = NULL; BackingPhotoRow* _tmp88_ = NULL; #line 457 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4209,7 +4218,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 4213 "Photo.c" +#line 4222 "Photo.c" } else { PhotoRow* _tmp89_ = NULL; BackingPhotoRow* _tmp90_ = NULL; @@ -4222,7 +4231,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 4226 "Photo.c" +#line 4235 "Photo.c" PhotoRow* _tmp92_ = NULL; BackingPhotoRow* _tmp93_ = NULL; BackingPhotoRow* _tmp94_ = NULL; @@ -4236,7 +4245,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 4240 "Photo.c" +#line 4249 "Photo.c" } else { GeeHashMap* _tmp95_ = NULL; PhotoRow* _tmp96_ = NULL; @@ -4252,7 +4261,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 4256 "Photo.c" +#line 4265 "Photo.c" GeeHashMap* _tmp99_ = NULL; PhotoRow* _tmp100_ = NULL; RawDeveloper _tmp101_ = 0; @@ -4269,7 +4278,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 4273 "Photo.c" +#line 4282 "Photo.c" } else { PhotoRow* _tmp103_ = NULL; BackingPhotoRow* _tmp104_ = NULL; @@ -4284,7 +4293,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 4288 "Photo.c" +#line 4297 "Photo.c" } } } @@ -4298,7 +4307,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) { _g_free0 (basename); #line 399 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 4302 "Photo.c" +#line 4311 "Photo.c" } @@ -4310,7 +4319,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 4314 "Photo.c" +#line 4323 "Photo.c" } @@ -4324,7 +4333,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 4328 "Photo.c" +#line 4337 "Photo.c" guint _tmp1_ = 0U; #line 482 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_discard_source_id; @@ -4332,7 +4341,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 4336 "Photo.c" +#line 4345 "Photo.c" } } @@ -4350,7 +4359,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_by_name (self, "editable-replaced", _tmp0_, _tmp1_); -#line 4354 "Photo.c" +#line 4363 "Photo.c" } @@ -4359,14 +4368,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 4363 "Photo.c" +#line 4372 "Photo.c" } static void photo_real_notify_raw_development_modified (Photo* self) { #line 492 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (self, "raw-development-modified"); -#line 4370 "Photo.c" +#line 4379 "Photo.c" } @@ -4375,14 +4384,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 4379 "Photo.c" +#line 4388 "Photo.c" } static void photo_real_notify_baseline_replaced (Photo* self) { #line 496 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (self, "baseline-replaced"); -#line 4386 "Photo.c" +#line 4395 "Photo.c" } @@ -4391,7 +4400,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 4395 "Photo.c" +#line 4404 "Photo.c" } @@ -4403,7 +4412,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_by_name (self, "master-reimported", _tmp0_); -#line 4407 "Photo.c" +#line 4416 "Photo.c" } @@ -4412,7 +4421,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 4416 "Photo.c" +#line 4425 "Photo.c" } @@ -4424,7 +4433,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_by_name (self, "editable-reimported", _tmp0_); -#line 4428 "Photo.c" +#line 4437 "Photo.c" } @@ -4433,7 +4442,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 4437 "Photo.c" +#line 4446 "Photo.c" } @@ -4445,7 +4454,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_by_name (self, "source-reimported", _tmp0_); -#line 4449 "Photo.c" +#line 4458 "Photo.c" } @@ -4454,7 +4463,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 4458 "Photo.c" +#line 4467 "Photo.c" } @@ -4466,7 +4475,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_by_name (self, "baseline-reimported", _tmp0_); -#line 4470 "Photo.c" +#line 4479 "Photo.c" } @@ -4475,7 +4484,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 4479 "Photo.c" +#line 4488 "Photo.c" } @@ -4496,14 +4505,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 4500 "Photo.c" +#line 4509 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; #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 4507 "Photo.c" +#line 4516 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -4513,7 +4522,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 4517 "Photo.c" +#line 4526 "Photo.c" PhotoBackingReaders* _tmp3_ = NULL; PhotoFileReader* _tmp4_ = NULL; GFile* _tmp5_ = NULL; @@ -4527,17 +4536,17 @@ 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 4531 "Photo.c" +#line 4540 "Photo.c" } } - __finally256: + __finally257: { PhotoBackingReaders* _tmp6_ = NULL; #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 4541 "Photo.c" +#line 4550 "Photo.c" } #line 518 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -4547,7 +4556,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 FALSE; -#line 4551 "Photo.c" +#line 4560 "Photo.c" } } #line 523 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4556,12 +4565,12 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _tmp7_ = photo_get_master_file_format (self); #line 525 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_ == PHOTO_FILE_FORMAT_RAW) { -#line 4560 "Photo.c" +#line 4569 "Photo.c" gint _tmp8_ = 0; RawDeveloper* _tmp9_ = NULL; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = raw_developer_as_array (&_tmp8_); -#line 4565 "Photo.c" +#line 4574 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; @@ -4573,30 +4582,30 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e d_collection_length1 = _tmp8_; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" for (d_it = 0; d_it < _tmp8_; d_it = d_it + 1) { -#line 4577 "Photo.c" +#line 4586 "Photo.c" RawDeveloper d = 0; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 4581 "Photo.c" +#line 4590 "Photo.c" { RawDeveloper _tmp10_ = 0; #line 527 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = d; #line 527 "/home/jens/Source/shotwell/src/Photo.vala" photo_delete_raw_development (self, _tmp10_); -#line 4588 "Photo.c" +#line 4597 "Photo.c" } } #line 526 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 4593 "Photo.c" +#line 4602 "Photo.c" } } #line 531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = file; #line 531 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_ != NULL) { -#line 4600 "Photo.c" +#line 4609 "Photo.c" { gboolean _tmp12_ = FALSE; GFile* _tmp13_ = NULL; @@ -4609,15 +4618,15 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _tmp12_ = _tmp14_; #line 533 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4613 "Photo.c" - goto __catch257_g_error; +#line 4622 "Photo.c" + goto __catch258_g_error; } #line 533 "/home/jens/Source/shotwell/src/Photo.vala" ret = _tmp12_; -#line 4618 "Photo.c" +#line 4627 "Photo.c" } - goto __finally257; - __catch257_g_error: + goto __finally258; + __catch258_g_error: { GError* err = NULL; GFile* _tmp15_ = NULL; @@ -4655,9 +4664,9 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _g_free0 (_tmp17_); #line 532 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 4659 "Photo.c" +#line 4668 "Photo.c" } - __finally257: + __finally258: #line 532 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 532 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4666,7 +4675,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 FALSE; -#line 4670 "Photo.c" +#line 4679 "Photo.c" } } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4681,21 +4690,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 FALSE; -#line 4685 "Photo.c" +#line 4694 "Photo.c" } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_) { -#line 4689 "Photo.c" +#line 4698 "Photo.c" gboolean _tmp25_ = FALSE; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = ret; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp25_; -#line 4695 "Photo.c" +#line 4704 "Photo.c" } else { #line 542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = FALSE; -#line 4699 "Photo.c" +#line 4708 "Photo.c" } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp22_; @@ -4703,7 +4712,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 4707 "Photo.c" +#line 4716 "Photo.c" } @@ -4728,11 +4737,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 4732 "Photo.c" +#line 4741 "Photo.c" } #line 551 "/home/jens/Source/shotwell/src/Photo.vala" backing_row = NULL; -#line 4736 "Photo.c" +#line 4745 "Photo.c" { BackingPhotoRow* _tmp2_ = NULL; BackingPhotoTable* _tmp3_ = NULL; @@ -4759,8 +4768,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 4763 "Photo.c" - goto __catch258_database_error; +#line 4772 "Photo.c" + goto __catch259_database_error; } #line 553 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing_row); @@ -4770,7 +4779,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 4774 "Photo.c" +#line 4783 "Photo.c" } #line 553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp2_; @@ -4782,10 +4791,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 4786 "Photo.c" +#line 4795 "Photo.c" } - goto __finally258; - __catch258_database_error: + goto __finally259; + __catch259_database_error: { GError* err = NULL; gchar* _tmp9_ = NULL; @@ -4810,9 +4819,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 4814 "Photo.c" +#line 4823 "Photo.c" } - __finally258: + __finally259: #line 552 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 552 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4823,13 +4832,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 4827 "Photo.c" +#line 4836 "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 4833 "Photo.c" +#line 4842 "Photo.c" { BackingPhotoTable* _tmp14_ = NULL; BackingPhotoTable* _tmp15_ = NULL; @@ -4848,8 +4857,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 4852 "Photo.c" - goto __catch259_database_error; +#line 4861 "Photo.c" + goto __catch260_database_error; } #line 560 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing_row); @@ -4859,11 +4868,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 4863 "Photo.c" +#line 4872 "Photo.c" } } - goto __finally259; - __catch259_database_error: + goto __finally260; + __catch260_database_error: { GError* err = NULL; #line 559 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4872,9 +4881,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 4876 "Photo.c" +#line 4885 "Photo.c" } - __finally259: + __finally260: #line 559 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 559 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4885,7 +4894,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 4889 "Photo.c" +#line 4898 "Photo.c" } #line 564 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; @@ -4893,13 +4902,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 4897 "Photo.c" +#line 4906 "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 4903 "Photo.c" +#line 4912 "Photo.c" } @@ -4908,14 +4917,14 @@ 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 4912 "Photo.c" +#line 4921 "Photo.c" { GeeHashMap* _tmp0_ = NULL; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 4919 "Photo.c" +#line 4928 "Photo.c" { gboolean _tmp1_ = FALSE; GeeHashMap* _tmp2_ = NULL; @@ -4929,7 +4938,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 4933 "Photo.c" +#line 4942 "Photo.c" GeeHashMap* _tmp5_ = NULL; RawDeveloper _tmp6_ = 0; gpointer _tmp7_ = NULL; @@ -4952,35 +4961,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 4956 "Photo.c" +#line 4965 "Photo.c" } else { #line 574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 4960 "Photo.c" +#line 4969 "Photo.c" } #line 574 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 4964 "Photo.c" +#line 4973 "Photo.c" { GeeHashMap* _tmp11_ = NULL; #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 4971 "Photo.c" +#line 4980 "Photo.c" } #line 574 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4975 "Photo.c" +#line 4984 "Photo.c" } - __finally260: + __finally261: { GeeHashMap* _tmp12_ = NULL; #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 4984 "Photo.c" +#line 4993 "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); @@ -4988,7 +4997,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 FALSE; -#line 4992 "Photo.c" +#line 5001 "Photo.c" } } @@ -4999,14 +5008,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 5003 "Photo.c" +#line 5012 "Photo.c" { GeeHashMap* _tmp0_ = NULL; #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 5010 "Photo.c" +#line 5019 "Photo.c" { GeeHashMap* _tmp1_ = NULL; RawDeveloper _tmp2_ = 0; @@ -5021,28 +5030,28 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { if (_tmp3_) { #line 583 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 5025 "Photo.c" +#line 5034 "Photo.c" { GeeHashMap* _tmp4_ = NULL; #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 5032 "Photo.c" +#line 5041 "Photo.c" } #line 583 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 5036 "Photo.c" +#line 5045 "Photo.c" } } - __finally261: + __finally262: { GeeHashMap* _tmp5_ = NULL; #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 5046 "Photo.c" +#line 5055 "Photo.c" } #line 581 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5052,7 +5061,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 FALSE; -#line 5056 "Photo.c" +#line 5065 "Photo.c" } } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5061,27 +5070,27 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { switch (_tmp6_) { #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_SHOTWELL: -#line 5065 "Photo.c" +#line 5074 "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 5071 "Photo.c" +#line 5080 "Photo.c" } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_CAMERA: -#line 5075 "Photo.c" +#line 5084 "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 5081 "Photo.c" +#line 5090 "Photo.c" } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_EMBEDDED: -#line 5085 "Photo.c" +#line 5094 "Photo.c" { { PhotoMetadata* meta = NULL; @@ -5096,8 +5105,8 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { meta = _tmp7_; #line 595 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5100 "Photo.c" - goto __catch262_g_error; +#line 5109 "Photo.c" + goto __catch263_g_error; } #line 596 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = meta; @@ -5109,7 +5118,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _tmp10_ = num_previews; #line 598 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_ > ((guint) 0)) { -#line 5113 "Photo.c" +#line 5122 "Photo.c" PhotoPreview* prev = NULL; PhotoMetadata* _tmp11_ = NULL; guint _tmp12_ = 0U; @@ -5145,7 +5154,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 5149 "Photo.c" +#line 5158 "Photo.c" } #line 605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = prev; @@ -5163,7 +5172,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _tmp21_ = _tmp20_.height; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_ > _tmp21_) { -#line 5167 "Photo.c" +#line 5176 "Photo.c" Dimensions _tmp22_ = {0}; gint _tmp23_ = 0; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5172,7 +5181,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _tmp23_ = _tmp22_.width; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp23_; -#line 5176 "Photo.c" +#line 5185 "Photo.c" } else { Dimensions _tmp24_ = {0}; gint _tmp25_ = 0; @@ -5182,7 +5191,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { _tmp25_ = _tmp24_.height; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp25_; -#line 5186 "Photo.c" +#line 5195 "Photo.c" } #line 608 "/home/jens/Source/shotwell/src/Photo.vala" preview_major_axis = _tmp17_; @@ -5198,7 +5207,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 5202 "Photo.c" +#line 5211 "Photo.c" } #line 613 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -5208,7 +5217,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 5212 "Photo.c" +#line 5221 "Photo.c" } #line 617 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; @@ -5216,10 +5225,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 5220 "Photo.c" +#line 5229 "Photo.c" } - goto __finally262; - __catch262_g_error: + goto __finally263; + __catch263_g_error: { GError* e = NULL; GError* _tmp27_ = NULL; @@ -5236,9 +5245,9 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp28_); #line 594 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5240 "Photo.c" +#line 5249 "Photo.c" } - __finally262: + __finally263: #line 594 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 594 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5247,19 +5256,19 @@ 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 FALSE; -#line 5251 "Photo.c" +#line 5260 "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 5257 "Photo.c" +#line 5266 "Photo.c" } default: { #line 624 "/home/jens/Source/shotwell/src/Photo.vala" g_assert_not_reached (); -#line 5263 "Photo.c" +#line 5272 "Photo.c" } } } @@ -5290,7 +5299,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 5294 "Photo.c" +#line 5303 "Photo.c" } { GeeHashMap* _tmp3_ = NULL; @@ -5298,7 +5307,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 5302 "Photo.c" +#line 5311 "Photo.c" { GeeHashMap* _tmp4_ = NULL; RawDeveloper _tmp5_ = 0; @@ -5311,16 +5320,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 5315 "Photo.c" +#line 5324 "Photo.c" } - __finally263: + __finally264: { GeeHashMap* _tmp7_ = NULL; #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 5324 "Photo.c" +#line 5333 "Photo.c" } #line 633 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5328,7 +5337,7 @@ 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 5332 "Photo.c" +#line 5341 "Photo.c" } } #line 636 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5339,7 +5348,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi 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 5343 "Photo.c" +#line 5352 "Photo.c" } @@ -5412,7 +5421,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 642 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5416 "Photo.c" +#line 5425 "Photo.c" } #line 644 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = info; @@ -5442,7 +5451,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 648 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5446 "Photo.c" +#line 5455 "Photo.c" } #line 650 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = interrogator; @@ -5456,7 +5465,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin if (_tmp13_ == NULL) { #line 651 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = TRUE; -#line 5460 "Photo.c" +#line 5469 "Photo.c" } else { PhotoFileInterrogator* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; @@ -5466,7 +5475,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _tmp15_ = photo_file_interrogator_get_is_photo_corrupted (_tmp14_); #line 651 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp15_; -#line 5470 "Photo.c" +#line 5479 "Photo.c" } #line 651 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { @@ -5480,7 +5489,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 654 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5484 "Photo.c" +#line 5493 "Photo.c" } #line 657 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = bpr; @@ -5512,7 +5521,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _tmp27_ = _tmp26_->metadata; #line 660 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp27_ != NULL) { -#line 5516 "Photo.c" +#line 5525 "Photo.c" DetectedPhotoInformation* _tmp28_ = NULL; PhotoMetadata* _tmp29_ = NULL; Orientation _tmp30_ = 0; @@ -5524,11 +5533,11 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _tmp30_ = photo_metadata_get_orientation (_tmp29_); #line 660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp30_; -#line 5528 "Photo.c" +#line 5537 "Photo.c" } else { #line 661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = ORIENTATION_TOP_LEFT; -#line 5532 "Photo.c" +#line 5541 "Photo.c" } #line 660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = bpr; @@ -5558,7 +5567,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 664 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5562 "Photo.c" +#line 5571 "Photo.c" } #line 665 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_table_get_instance (); @@ -5590,7 +5599,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 665 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5594 "Photo.c" +#line 5603 "Photo.c" } #line 639 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); @@ -5600,7 +5609,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (info); #line 639 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 5604 "Photo.c" +#line 5613 "Photo.c" } @@ -5621,7 +5630,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { switch (_tmp0_) { #line 674 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_SHOTWELL: -#line 5625 "Photo.c" +#line 5634 "Photo.c" { { BackingPhotoRow* _tmp1_ = NULL; @@ -5661,8 +5670,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _tmp1_ = _tmp6_; #line 678 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5665 "Photo.c" - goto __catch264_g_error; +#line 5674 "Photo.c" + goto __catch265_g_error; } #line 678 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp1_; @@ -5674,14 +5683,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { bps = _tmp7_; #line 679 "/home/jens/Source/shotwell/src/Photo.vala" pix = NULL; -#line 5678 "Photo.c" +#line 5687 "Photo.c" { PhotoBackingReaders* _tmp8_ = NULL; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->priv->readers; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 5685 "Photo.c" +#line 5694 "Photo.c" { GdkPixbuf* _tmp9_ = NULL; Scaling _tmp10_ = {0}; @@ -5695,8 +5704,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _tmp9_ = _tmp11_; #line 685 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5699 "Photo.c" - goto __finally265; +#line 5708 "Photo.c" + goto __finally266; } #line 685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp9_; @@ -5708,16 +5717,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { pix = _tmp12_; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp9_); -#line 5712 "Photo.c" +#line 5721 "Photo.c" } - __finally265: + __finally266: { PhotoBackingReaders* _tmp13_ = NULL; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->readers; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 5721 "Photo.c" +#line 5730 "Photo.c" } #line 680 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5725,8 +5734,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 680 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5729 "Photo.c" - goto __catch264_g_error; +#line 5738 "Photo.c" + goto __catch265_g_error; } } #line 688 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5739,14 +5748,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 690 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5743 "Photo.c" +#line 5752 "Photo.c" { gboolean _tmp15_ = FALSE; #line 714 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = wrote_img_to_disk; #line 714 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 5750 "Photo.c" +#line 5759 "Photo.c" { RawDeveloper _tmp16_ = 0; BackingPhotoRow* _tmp17_ = NULL; @@ -5758,15 +5767,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp16_, _tmp17_, &_inner_error_); #line 717 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5762 "Photo.c" - goto __catch266_g_error; +#line 5771 "Photo.c" + goto __catch267_g_error; } #line 719 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 5767 "Photo.c" +#line 5776 "Photo.c" } - goto __finally266; - __catch266_g_error: + goto __finally267; + __catch267_g_error: { GError* e = NULL; GError* _tmp18_ = NULL; @@ -5783,13 +5792,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp19_); #line 715 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5787 "Photo.c" +#line 5796 "Photo.c" } - __finally266: + __finally267: #line 715 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5792 "Photo.c" - goto __catch264_g_error; +#line 5801 "Photo.c" + goto __catch265_g_error; } } } @@ -5797,7 +5806,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _backing_photo_row_unref0 (bps); #line 690 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5801 "Photo.c" +#line 5810 "Photo.c" } #line 694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = bps; @@ -5813,8 +5822,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 694 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5817 "Photo.c" - goto __catch264_g_error; +#line 5826 "Photo.c" + goto __catch265_g_error; } #line 695 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = writer; @@ -5830,8 +5839,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 695 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5834 "Photo.c" - goto __catch264_g_error; +#line 5843 "Photo.c" + goto __catch265_g_error; } #line 703 "/home/jens/Source/shotwell/src/Photo.vala" wrote_img_to_disk = TRUE; @@ -5847,8 +5856,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 708 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5851 "Photo.c" - goto __catch264_g_error; +#line 5860 "Photo.c" + goto __catch265_g_error; } #line 709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = bps; @@ -5868,8 +5877,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 709 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5872 "Photo.c" - goto __catch264_g_error; +#line 5881 "Photo.c" + goto __catch265_g_error; } #line 710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = mwriter; @@ -5889,8 +5898,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 710 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5893 "Photo.c" - goto __catch264_g_error; +#line 5902 "Photo.c" + goto __catch265_g_error; } #line 676 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (mwriter); @@ -5902,10 +5911,10 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _g_object_unref0 (pix); #line 676 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 5906 "Photo.c" +#line 5915 "Photo.c" } - goto __finally264; - __catch264_g_error: + goto __finally265; + __catch265_g_error: { GError* err = NULL; GError* _tmp31_ = NULL; @@ -5922,16 +5931,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:712: Error developing photo: %s", _tmp32_); #line 676 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 5926 "Photo.c" +#line 5935 "Photo.c" } - __finally264: + __finally265: { gboolean _tmp33_ = FALSE; #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 5935 "Photo.c" +#line 5944 "Photo.c" { RawDeveloper _tmp34_ = 0; BackingPhotoRow* _tmp35_ = NULL; @@ -5943,15 +5952,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp34_, _tmp35_, &_inner_error_); #line 717 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5947 "Photo.c" - goto __catch267_g_error; +#line 5956 "Photo.c" + goto __catch268_g_error; } #line 719 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 5952 "Photo.c" +#line 5961 "Photo.c" } - goto __finally267; - __catch267_g_error: + goto __finally268; + __catch268_g_error: { GError* e = NULL; GError* _tmp36_ = NULL; @@ -5968,9 +5977,9 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp37_); #line 715 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5972 "Photo.c" +#line 5981 "Photo.c" } - __finally267: + __finally268: #line 715 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 715 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5981,7 +5990,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 715 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5985 "Photo.c" +#line 5994 "Photo.c" } } } @@ -5995,23 +6004,23 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 676 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5999 "Photo.c" +#line 6008 "Photo.c" } #line 727 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 6003 "Photo.c" +#line 6012 "Photo.c" } #line 674 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_CAMERA: -#line 6007 "Photo.c" +#line 6016 "Photo.c" { #line 731 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 6011 "Photo.c" +#line 6020 "Photo.c" } #line 674 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_EMBEDDED: -#line 6015 "Photo.c" +#line 6024 "Photo.c" { { PhotoMetadata* meta = NULL; @@ -6054,8 +6063,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { meta = _tmp38_; #line 736 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6058 "Photo.c" - goto __catch268_g_error; +#line 6067 "Photo.c" + goto __catch269_g_error; } #line 737 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = meta; @@ -6069,14 +6078,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { if (_tmp41_ <= ((guint) 0)) { #line 739 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6073 "Photo.c" +#line 6082 "Photo.c" { gboolean _tmp42_ = FALSE; #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 6080 "Photo.c" +#line 6089 "Photo.c" { RawDeveloper _tmp43_ = 0; BackingPhotoRow* _tmp44_ = NULL; @@ -6088,15 +6097,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp43_, _tmp44_, &_inner_error_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6092 "Photo.c" - goto __catch269_g_error; +#line 6101 "Photo.c" + goto __catch270_g_error; } #line 773 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6097 "Photo.c" +#line 6106 "Photo.c" } - goto __finally269; - __catch269_g_error: + goto __finally270; + __catch270_g_error: { GError* e = NULL; GError* _tmp45_ = NULL; @@ -6113,13 +6122,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp46_); #line 769 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6117 "Photo.c" +#line 6126 "Photo.c" } - __finally269: + __finally270: #line 769 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6122 "Photo.c" - goto __catch268_g_error; +#line 6131 "Photo.c" + goto __catch269_g_error; } } } @@ -6127,7 +6136,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _backing_photo_row_unref0 (bps); #line 739 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6131 "Photo.c" +#line 6140 "Photo.c" } #line 740 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = meta; @@ -6147,14 +6156,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 743 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6151 "Photo.c" +#line 6160 "Photo.c" { gboolean _tmp51_ = FALSE; #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 6158 "Photo.c" +#line 6167 "Photo.c" { RawDeveloper _tmp52_ = 0; BackingPhotoRow* _tmp53_ = NULL; @@ -6166,15 +6175,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp52_, _tmp53_, &_inner_error_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6170 "Photo.c" - goto __catch270_g_error; +#line 6179 "Photo.c" + goto __catch271_g_error; } #line 773 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6175 "Photo.c" +#line 6184 "Photo.c" } - goto __finally270; - __catch270_g_error: + goto __finally271; + __catch271_g_error: { GError* e = NULL; GError* _tmp54_ = NULL; @@ -6191,13 +6200,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp55_); #line 769 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6195 "Photo.c" +#line 6204 "Photo.c" } - __finally270: + __finally271: #line 769 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6200 "Photo.c" - goto __catch268_g_error; +#line 6209 "Photo.c" + goto __catch269_g_error; } } } @@ -6205,7 +6214,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _backing_photo_row_unref0 (bps); #line 743 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6209 "Photo.c" +#line 6218 "Photo.c" } #line 746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = prev; @@ -6219,8 +6228,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 746 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6223 "Photo.c" - goto __catch268_g_error; +#line 6232 "Photo.c" + goto __catch269_g_error; } #line 747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = pix; @@ -6234,14 +6243,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 749 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6238 "Photo.c" +#line 6247 "Photo.c" { gboolean _tmp59_ = FALSE; #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 6245 "Photo.c" +#line 6254 "Photo.c" { RawDeveloper _tmp60_ = 0; BackingPhotoRow* _tmp61_ = NULL; @@ -6253,15 +6262,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp60_, _tmp61_, &_inner_error_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6257 "Photo.c" - goto __catch271_g_error; +#line 6266 "Photo.c" + goto __catch272_g_error; } #line 773 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6262 "Photo.c" +#line 6271 "Photo.c" } - goto __finally271; - __catch271_g_error: + goto __finally272; + __catch272_g_error: { GError* e = NULL; GError* _tmp62_ = NULL; @@ -6278,13 +6287,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp63_); #line 769 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6282 "Photo.c" +#line 6291 "Photo.c" } - __finally271: + __finally272: #line 769 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6287 "Photo.c" - goto __catch268_g_error; +#line 6296 "Photo.c" + goto __catch269_g_error; } } } @@ -6292,7 +6301,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _backing_photo_row_unref0 (bps); #line 749 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6296 "Photo.c" +#line 6305 "Photo.c" } #line 753 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = d; @@ -6314,8 +6323,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 753 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6318 "Photo.c" - goto __catch268_g_error; +#line 6327 "Photo.c" + goto __catch269_g_error; } #line 753 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = _tmp64_; @@ -6343,8 +6352,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 754 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6347 "Photo.c" - goto __catch268_g_error; +#line 6356 "Photo.c" + goto __catch269_g_error; } #line 755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = writer; @@ -6364,8 +6373,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 755 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6368 "Photo.c" - goto __catch268_g_error; +#line 6377 "Photo.c" + goto __catch269_g_error; } #line 759 "/home/jens/Source/shotwell/src/Photo.vala" wrote_img_to_disk = TRUE; @@ -6389,8 +6398,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 762 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6393 "Photo.c" - goto __catch268_g_error; +#line 6402 "Photo.c" + goto __catch269_g_error; } #line 763 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = mwriter; @@ -6412,8 +6421,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 763 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6416 "Photo.c" - goto __catch268_g_error; +#line 6425 "Photo.c" + goto __catch269_g_error; } #line 734 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (mwriter); @@ -6427,10 +6436,10 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _photo_preview_unref0 (prev); #line 734 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6431 "Photo.c" +#line 6440 "Photo.c" } - goto __finally268; - __catch268_g_error: + goto __finally269; + __catch269_g_error: { GError* e = NULL; GError* _tmp81_ = NULL; @@ -6447,14 +6456,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:765: Error accessing embedded preview. Message: %s", _tmp82_); #line 766 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6451 "Photo.c" +#line 6460 "Photo.c" { gboolean _tmp83_ = FALSE; #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 6458 "Photo.c" +#line 6467 "Photo.c" { RawDeveloper _tmp84_ = 0; BackingPhotoRow* _tmp85_ = NULL; @@ -6466,15 +6475,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp84_, _tmp85_, &_inner_error_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6470 "Photo.c" - goto __catch272_g_error; +#line 6479 "Photo.c" + goto __catch273_g_error; } #line 773 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6475 "Photo.c" +#line 6484 "Photo.c" } - goto __finally272; - __catch272_g_error: + goto __finally273; + __catch273_g_error: { GError* e = NULL; GError* _tmp86_ = NULL; @@ -6491,14 +6500,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp87_); #line 769 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6495 "Photo.c" +#line 6504 "Photo.c" } - __finally272: + __finally273: #line 769 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 769 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 6502 "Photo.c" +#line 6511 "Photo.c" } } } @@ -6506,16 +6515,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { _backing_photo_row_unref0 (bps); #line 766 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6510 "Photo.c" +#line 6519 "Photo.c" } - __finally268: + __finally269: { gboolean _tmp88_ = FALSE; #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 6519 "Photo.c" +#line 6528 "Photo.c" { RawDeveloper _tmp89_ = 0; BackingPhotoRow* _tmp90_ = NULL; @@ -6527,15 +6536,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { photo_add_backing_photo_for_development (self, _tmp89_, _tmp90_, &_inner_error_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6531 "Photo.c" - goto __catch273_g_error; +#line 6540 "Photo.c" + goto __catch274_g_error; } #line 773 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6536 "Photo.c" +#line 6545 "Photo.c" } - goto __finally273; - __catch273_g_error: + goto __finally274; + __catch274_g_error: { GError* e = NULL; GError* _tmp91_ = NULL; @@ -6552,9 +6561,9 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp92_); #line 769 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6556 "Photo.c" +#line 6565 "Photo.c" } - __finally273: + __finally274: #line 769 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 769 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6565,7 +6574,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 769 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6569 "Photo.c" +#line 6578 "Photo.c" } } } @@ -6579,22 +6588,22 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 734 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6583 "Photo.c" +#line 6592 "Photo.c" } #line 780 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 6587 "Photo.c" +#line 6596 "Photo.c" } default: { #line 783 "/home/jens/Source/shotwell/src/Photo.vala" g_assert_not_reached (); -#line 6593 "Photo.c" +#line 6602 "Photo.c" } } #line 670 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 6598 "Photo.c" +#line 6607 "Photo.c" } @@ -6602,14 +6611,14 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) { GError * _inner_error_ = NULL; #line 788 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 6606 "Photo.c" +#line 6615 "Photo.c" { PhotoRow* _tmp0_ = NULL; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 6613 "Photo.c" +#line 6622 "Photo.c" { PhotoRow* _tmp1_ = NULL; RawDeveloper _tmp2_ = 0; @@ -6619,16 +6628,16 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) { _tmp2_ = d; #line 790 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_->developer = _tmp2_; -#line 6623 "Photo.c" +#line 6632 "Photo.c" } - __finally274: + __finally275: { PhotoRow* _tmp3_ = NULL; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 6632 "Photo.c" +#line 6641 "Photo.c" } #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -6638,7 +6647,7 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6642 "Photo.c" +#line 6651 "Photo.c" } } } @@ -6660,29 +6669,29 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { #line 797 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6664 "Photo.c" +#line 6673 "Photo.c" } #line 802 "/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" if (_tmp2_) { -#line 6670 "Photo.c" +#line 6679 "Photo.c" RawDeveloper _tmp3_ = 0; #line 802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = d; #line 802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED; -#line 6676 "Photo.c" +#line 6685 "Photo.c" } else { #line 802 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 6680 "Photo.c" +#line 6689 "Photo.c" } #line 802 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { #line 803 "/home/jens/Source/shotwell/src/Photo.vala" d = RAW_DEVELOPER_CAMERA; -#line 6686 "Photo.c" +#line 6695 "Photo.c" } #line 807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED); @@ -6690,7 +6699,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { if (!_tmp4_) { #line 808 "/home/jens/Source/shotwell/src/Photo.vala" d = RAW_DEVELOPER_SHOTWELL; -#line 6694 "Photo.c" +#line 6703 "Photo.c" } { GeeHashMap* _tmp5_ = NULL; @@ -6698,27 +6707,27 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { _tmp5_ = self->priv->developments; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 6702 "Photo.c" +#line 6711 "Photo.c" { RawDeveloper stale_raw_developer = 0; PhotoRow* _tmp6_ = NULL; RawDeveloper _tmp7_ = 0; RawDeveloper _tmp8_ = 0; gboolean _tmp9_ = FALSE; - GeeHashMap* _tmp15_ = NULL; + GeeHashMap* _tmp11_ = NULL; + RawDeveloper _tmp12_ = 0; + gboolean _tmp13_ = FALSE; + PhotoRow* _tmp15_ = NULL; RawDeveloper _tmp16_ = 0; - gboolean _tmp17_ = FALSE; - PhotoRow* _tmp19_ = NULL; - RawDeveloper _tmp20_ = 0; - GeeHashMap* _tmp21_ = NULL; - RawDeveloper _tmp22_ = 0; - gpointer _tmp23_ = NULL; - PhotoBackingReaders* _tmp24_ = NULL; - BackingPhotoRow* _tmp25_ = NULL; - PhotoFileFormat _tmp26_ = 0; - BackingPhotoRow* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - PhotoFileReader* _tmp29_ = NULL; + GeeHashMap* _tmp17_ = NULL; + RawDeveloper _tmp18_ = 0; + gpointer _tmp19_ = NULL; + PhotoBackingReaders* _tmp20_ = NULL; + BackingPhotoRow* _tmp21_ = NULL; + PhotoFileFormat _tmp22_ = 0; + BackingPhotoRow* _tmp23_ = NULL; + const gchar* _tmp24_ = NULL; + PhotoFileReader* _tmp25_ = NULL; BackingPhotoRow* _tmp30_ = NULL; Orientation _tmp31_ = 0; gboolean _tmp41_ = FALSE; @@ -6735,134 +6744,135 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { _tmp9_ = photo_is_raw_developer_complete (self, _tmp8_); #line 814 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp9_) { -#line 6739 "Photo.c" +#line 6748 "Photo.c" RawDeveloper _tmp10_ = 0; #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 6745 "Photo.c" - { - GdkPixbuf* _tmp11_ = NULL; - GdkPixbuf* _tmp12_ = NULL; +#line 6754 "Photo.c" + } #line 817 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_get_prefetched_copy (self, &_inner_error_); + _tmp11_ = self->priv->developments; #line 817 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_; + _tmp12_ = d; #line 817 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp12_); + _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 (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6757 "Photo.c" - goto __catch276_g_error; - } - } - goto __finally276; - __catch276_g_error: + if (!_tmp13_) { +#line 6764 "Photo.c" { - GError* e = NULL; -#line 816 "/home/jens/Source/shotwell/src/Photo.vala" - e = _inner_error_; -#line 816 "/home/jens/Source/shotwell/src/Photo.vala" - _inner_error_ = NULL; -#line 820 "/home/jens/Source/shotwell/src/Photo.vala" - _g_error_free0 (e); -#line 6771 "Photo.c" - { - GeeHashMap* _tmp13_ = NULL; + GeeHashMap* _tmp14_ = NULL; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->priv->developments; + _tmp14_ = self->priv->developments; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" - g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6778 "Photo.c" - } -#line 820 "/home/jens/Source/shotwell/src/Photo.vala" - return; -#line 6782 "Photo.c" + g_rec_mutex_unlock (&self->priv->__lock_developments); +#line 6771 "Photo.c" } - __finally276: -#line 816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 818 "/home/jens/Source/shotwell/src/Photo.vala" + return; +#line 6775 "Photo.c" + } +#line 821 "/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" + _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 6811 "Photo.c" + { + GdkPixbuf* _tmp26_ = NULL; + GdkPixbuf* _tmp27_ = NULL; +#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" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6787 "Photo.c" - { - GeeHashMap* _tmp14_ = NULL; +#line 6823 "Photo.c" + goto __catch277_g_error; + } + } + goto __finally277; + __catch277_g_error: + { + GError* e = NULL; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" + e = _inner_error_; +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" + _inner_error_ = NULL; +#line 832 "/home/jens/Source/shotwell/src/Photo.vala" + _g_error_free0 (e); +#line 6837 "Photo.c" + { + GeeHashMap* _tmp28_ = NULL; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->priv->developments; + _tmp28_ = self->priv->developments; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" - g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6794 "Photo.c" - } -#line 816 "/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 816 "/home/jens/Source/shotwell/src/Photo.vala" - g_clear_error (&_inner_error_); -#line 816 "/home/jens/Source/shotwell/src/Photo.vala" - return; -#line 6802 "Photo.c" + g_rec_mutex_unlock (&self->priv->__lock_developments); +#line 6844 "Photo.c" } +#line 832 "/home/jens/Source/shotwell/src/Photo.vala" + return; +#line 6848 "Photo.c" } -#line 823 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = self->priv->developments; -#line 823 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = d; -#line 823 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp16_)); -#line 823 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp17_) { -#line 6813 "Photo.c" + __finally277: +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 6853 "Photo.c" { - GeeHashMap* _tmp18_ = NULL; + GeeHashMap* _tmp29_ = NULL; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->priv->developments; + _tmp29_ = self->priv->developments; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6820 "Photo.c" +#line 6860 "Photo.c" } -#line 824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 828 "/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" + g_clear_error (&_inner_error_); +#line 828 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6824 "Photo.c" +#line 6868 "Photo.c" } -#line 827 "/home/jens/Source/shotwell/src/Photo.vala" - photo_revert_to_master (self, FALSE); -#line 830 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; -#line 830 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = d; -#line 830 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_->developer = _tmp20_; -#line 831 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = self->priv->developments; -#line 831 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = d; -#line 831 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp22_)); -#line 831 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (self->backing_photo_row); -#line 831 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = (BackingPhotoRow*) _tmp23_; -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = self->priv->readers; -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->backing_photo_row; -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_->file_format; -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = self->backing_photo_row; -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_->filepath; -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = photo_file_format_create_reader (_tmp26_, _tmp28_); -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp24_->developer); -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_->developer = _tmp29_; -#line 834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 835 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = self->backing_photo_row; -#line 834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 835 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_->original_orientation; -#line 834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 835 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp31_); -#line 6866 "Photo.c" +#line 6876 "Photo.c" { PhotoTable* _tmp32_ = NULL; PhotoTable* _tmp33_ = NULL; @@ -6870,109 +6880,109 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { RawDeveloper _tmp35_ = 0; BackingPhotoRow* _tmp36_ = NULL; BackingPhotoID _tmp37_ = {0}; -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = photo_table_get_instance (); -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_; -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = self->row; -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = d; -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = self->backing_photo_row; -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_->id; -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 838 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_update_raw_development (_tmp33_, _tmp34_, _tmp35_, &_tmp37_, &_inner_error_); -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 838 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp33_); -#line 837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 838 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6892 "Photo.c" - goto __catch277_g_error; +#line 6902 "Photo.c" + goto __catch278_g_error; } } - goto __finally277; - __catch277_g_error: + goto __finally278; + __catch278_g_error: { GError* e = NULL; GError* _tmp38_ = NULL; const gchar* _tmp39_ = NULL; -#line 836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 837 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 837 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 839 "/home/jens/Source/shotwell/src/Photo.vala" +#line 840 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = e; -#line 839 "/home/jens/Source/shotwell/src/Photo.vala" +#line 840 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp38_->message; -#line 839 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:839: Error updating database: %s", _tmp39_); -#line 836 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_error_free0 (e); -#line 6914 "Photo.c" +#line 6924 "Photo.c" } - __finally277: -#line 836 "/home/jens/Source/shotwell/src/Photo.vala" + __finally278: +#line 837 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6919 "Photo.c" +#line 6929 "Photo.c" { GeeHashMap* _tmp40_ = NULL; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = self->priv->developments; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6926 "Photo.c" +#line 6936 "Photo.c" } -#line 836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 837 "/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 836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 837 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 837 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6934 "Photo.c" +#line 6944 "Photo.c" } -#line 846 "/home/jens/Source/shotwell/src/Photo.vala" +#line 847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = stale_raw_developer; -#line 846 "/home/jens/Source/shotwell/src/Photo.vala" +#line 847 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp42_ != RAW_DEVELOPER_CAMERA) { -#line 6940 "Photo.c" +#line 6950 "Photo.c" RawDeveloper _tmp43_ = 0; PhotoRow* _tmp44_ = NULL; RawDeveloper _tmp45_ = 0; -#line 847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = stale_raw_developer; -#line 847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = self->row; -#line 847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp44_->developer; -#line 847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp43_ != _tmp45_; -#line 6952 "Photo.c" +#line 6962 "Photo.c" } else { -#line 846 "/home/jens/Source/shotwell/src/Photo.vala" +#line 847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = FALSE; -#line 6956 "Photo.c" +#line 6966 "Photo.c" } -#line 846 "/home/jens/Source/shotwell/src/Photo.vala" +#line 847 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 6960 "Photo.c" +#line 6970 "Photo.c" RawDeveloper _tmp46_ = 0; -#line 850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = stale_raw_developer; -#line 850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 851 "/home/jens/Source/shotwell/src/Photo.vala" photo_delete_raw_development (self, _tmp46_); -#line 6966 "Photo.c" +#line 6976 "Photo.c" } } - __finally275: + __finally276: { GeeHashMap* _tmp47_ = NULL; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = self->priv->developments; #line 810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6976 "Photo.c" +#line 6986 "Photo.c" } #line 810 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -6982,20 +6992,20 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 810 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6986 "Photo.c" +#line 6996 "Photo.c" } } -#line 857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 858 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = alteration_new ("image", "developer"); -#line 857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 858 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = _tmp48_; -#line 857 "/home/jens/Source/shotwell/src/Photo.vala" +#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 857 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp49_); #line 858 "/home/jens/Source/shotwell/src/Photo.vala" + _alteration_unref0 (_tmp49_); +#line 859 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_prefetched (self); -#line 6999 "Photo.c" +#line 7009 "Photo.c" } @@ -7003,17 +7013,17 @@ RawDeveloper photo_get_raw_developer (Photo* self) { RawDeveloper result = 0; PhotoRow* _tmp0_ = NULL; RawDeveloper _tmp1_ = 0; -#line 861 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (IS_PHOTO (self), 0); #line 862 "/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" _tmp0_ = self->row; -#line 862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_->developer; -#line 862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 863 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 863 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7017 "Photo.c" +#line 7027 "Photo.c" } @@ -7021,18 +7031,18 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { gboolean result = FALSE; gboolean ret = FALSE; GError * _inner_error_ = NULL; -#line 867 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 868 "/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" ret = FALSE; -#line 7029 "Photo.c" +#line 7039 "Photo.c" { GeeHashMap* _tmp0_ = NULL; -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 7036 "Photo.c" +#line 7046 "Photo.c" { GeeHashMap* _tmp1_ = NULL; RawDeveloper _tmp2_ = 0; @@ -7051,160 +7061,160 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { GeeHashMap* _tmp37_ = NULL; RawDeveloper _tmp38_ = 0; gboolean _tmp39_ = FALSE; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 872 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->developments; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 872 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = d; -#line 871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 872 "/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 871 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { #line 872 "/home/jens/Source/shotwell/src/Photo.vala" + if (!_tmp3_) { +#line 873 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 7065 "Photo.c" +#line 7075 "Photo.c" { GeeHashMap* _tmp4_ = NULL; -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->developments; -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7072 "Photo.c" +#line 7082 "Photo.c" } -#line 872 "/home/jens/Source/shotwell/src/Photo.vala" +#line 873 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7076 "Photo.c" +#line 7086 "Photo.c" } -#line 876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 877 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 877 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 877 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = d; -#line 876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 877 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = raw_developer_to_string (_tmp7_); -#line 876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 877 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 876 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:876: Delete raw development: %s %s", _tmp6_, _tmp9_); -#line 876 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp9_); -#line 876 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp6_); #line 877 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp6_); +#line 878 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->priv->developments; -#line 877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 878 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = d; -#line 877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 878 "/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 877 "/home/jens/Source/shotwell/src/Photo.vala" - bpr = (BackingPhotoRow*) _tmp12_; #line 878 "/home/jens/Source/shotwell/src/Photo.vala" + bpr = (BackingPhotoRow*) _tmp12_; +#line 879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = bpr; -#line 878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->filepath; -#line 878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 879 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 7108 "Photo.c" +#line 7118 "Photo.c" GFile* f = NULL; BackingPhotoRow* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; GFile* _tmp17_ = NULL; -#line 879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = bpr; -#line 879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_->filepath; -#line 879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = g_file_new_for_path (_tmp16_); -#line 879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 880 "/home/jens/Source/shotwell/src/Photo.vala" f = _tmp17_; -#line 7121 "Photo.c" +#line 7131 "Photo.c" { RawDeveloper _tmp18_ = 0; -#line 881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = d; -#line 881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 882 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_ == RAW_DEVELOPER_CAMERA) { -#line 7128 "Photo.c" +#line 7138 "Photo.c" GFile* _tmp19_ = NULL; -#line 882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 883 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = f; -#line 882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 883 "/home/jens/Source/shotwell/src/Photo.vala" g_file_trash (_tmp19_, NULL, &_inner_error_); -#line 882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 883 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7136 "Photo.c" - goto __catch279_g_error; +#line 7146 "Photo.c" + goto __catch280_g_error; } } else { GFile* _tmp20_ = NULL; -#line 884 "/home/jens/Source/shotwell/src/Photo.vala" +#line 885 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = f; -#line 884 "/home/jens/Source/shotwell/src/Photo.vala" +#line 885 "/home/jens/Source/shotwell/src/Photo.vala" g_file_delete (_tmp20_, NULL, &_inner_error_); -#line 884 "/home/jens/Source/shotwell/src/Photo.vala" +#line 885 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7147 "Photo.c" - goto __catch279_g_error; +#line 7157 "Photo.c" + goto __catch280_g_error; } } } - goto __finally279; - __catch279_g_error: + goto __finally280; + __catch280_g_error: { GError* e = NULL; BackingPhotoRow* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; GError* _tmp23_ = NULL; const gchar* _tmp24_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 881 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 881 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = bpr; -#line 886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_->filepath; -#line 886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = e; -#line 886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_->message; -#line 886 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:886: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_); -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_error_free0 (e); -#line 7176 "Photo.c" +#line 7186 "Photo.c" } - __finally279: -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" + __finally280: +#line 881 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 881 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 881 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 881 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 881 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7189 "Photo.c" +#line 7199 "Photo.c" { GeeHashMap* _tmp25_ = NULL; -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->priv->developments; -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7196 "Photo.c" +#line 7206 "Photo.c" } -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 881 "/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 880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 881 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 881 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 7204 "Photo.c" +#line 7214 "Photo.c" } -#line 878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 879 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 7208 "Photo.c" +#line 7218 "Photo.c" } { PhotoTable* _tmp26_ = NULL; @@ -7215,238 +7225,238 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { BackingPhotoTable* _tmp31_ = NULL; BackingPhotoRow* _tmp32_ = NULL; BackingPhotoID _tmp33_ = {0}; -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 893 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = photo_table_get_instance (); -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 893 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_; -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 893 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = self->row; -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 893 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = d; -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 893 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_remove_development (_tmp27_, _tmp28_, _tmp29_, &_inner_error_); -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 893 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp27_); -#line 892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 893 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7233 "Photo.c" - goto __catch280_g_error; +#line 7243 "Photo.c" + goto __catch281_g_error; } -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 894 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = backing_photo_table_get_instance (); -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 894 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_; -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 894 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = bpr; -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 894 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_->id; -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 894 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_remove (_tmp31_, &_tmp33_, &_inner_error_); -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 894 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp31_); -#line 893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 894 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7250 "Photo.c" - goto __catch280_g_error; +#line 7260 "Photo.c" + goto __catch281_g_error; } } - goto __finally280; - __catch280_g_error: + goto __finally281; + __catch281_g_error: { GError* e = NULL; GError* _tmp34_ = NULL; const gchar* _tmp35_ = NULL; -#line 891 "/home/jens/Source/shotwell/src/Photo.vala" +#line 892 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 891 "/home/jens/Source/shotwell/src/Photo.vala" +#line 892 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 895 "/home/jens/Source/shotwell/src/Photo.vala" +#line 896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = e; -#line 895 "/home/jens/Source/shotwell/src/Photo.vala" +#line 896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_->message; -#line 895 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:895: Database error while deleting RAW development: %s", _tmp35_); -#line 891 "/home/jens/Source/shotwell/src/Photo.vala" +#line 896 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:896: Database error while deleting RAW development: %s", _tmp35_); +#line 892 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 7272 "Photo.c" +#line 7282 "Photo.c" } - __finally280: -#line 891 "/home/jens/Source/shotwell/src/Photo.vala" + __finally281: +#line 892 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 891 "/home/jens/Source/shotwell/src/Photo.vala" +#line 892 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 891 "/home/jens/Source/shotwell/src/Photo.vala" +#line 892 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7281 "Photo.c" +#line 7291 "Photo.c" { GeeHashMap* _tmp36_ = NULL; -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = self->priv->developments; -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7288 "Photo.c" +#line 7298 "Photo.c" } -#line 891 "/home/jens/Source/shotwell/src/Photo.vala" +#line 892 "/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 891 "/home/jens/Source/shotwell/src/Photo.vala" +#line 892 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 891 "/home/jens/Source/shotwell/src/Photo.vala" +#line 892 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 7296 "Photo.c" +#line 7306 "Photo.c" } -#line 898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = self->priv->developments; -#line 898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = d; -#line 898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp38_), NULL); -#line 898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 899 "/home/jens/Source/shotwell/src/Photo.vala" ret = _tmp39_; -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7308 "Photo.c" +#line 7318 "Photo.c" } - __finally278: + __finally279: { GeeHashMap* _tmp40_ = NULL; -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = self->priv->developments; -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7317 "Photo.c" +#line 7327 "Photo.c" } -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/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 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 871 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 7327 "Photo.c" +#line 7337 "Photo.c" } } -#line 901 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_raw_development_modified (self); #line 902 "/home/jens/Source/shotwell/src/Photo.vala" + photo_notify_raw_development_modified (self); +#line 903 "/home/jens/Source/shotwell/src/Photo.vala" result = ret; -#line 902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 903 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7336 "Photo.c" +#line 7346 "Photo.c" } void photo_redevelop_raw (Photo* self, RawDeveloper d) { GError * _inner_error_ = NULL; -#line 906 "/home/jens/Source/shotwell/src/Photo.vala" +#line 907 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 7344 "Photo.c" +#line 7354 "Photo.c" { GeeHashMap* _tmp0_ = NULL; -#line 907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 908 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; -#line 907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 908 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 7351 "Photo.c" +#line 7361 "Photo.c" { RawDeveloper _tmp1_ = 0; RawDeveloper dev = 0; RawDeveloper _tmp2_ = 0; RawDeveloper _tmp3_ = 0; RawDeveloper _tmp4_ = 0; -#line 908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 909 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = d; -#line 908 "/home/jens/Source/shotwell/src/Photo.vala" - photo_delete_raw_development (self, _tmp1_); #line 909 "/home/jens/Source/shotwell/src/Photo.vala" + photo_delete_raw_development (self, _tmp1_); +#line 910 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = d; -#line 909 "/home/jens/Source/shotwell/src/Photo.vala" - dev = _tmp2_; #line 910 "/home/jens/Source/shotwell/src/Photo.vala" + dev = _tmp2_; +#line 911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = dev; -#line 910 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp3_ == RAW_DEVELOPER_CAMERA) { #line 911 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp3_ == RAW_DEVELOPER_CAMERA) { +#line 912 "/home/jens/Source/shotwell/src/Photo.vala" dev = RAW_DEVELOPER_EMBEDDED; -#line 7372 "Photo.c" +#line 7382 "Photo.c" } -#line 913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 914 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = dev; -#line 913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 914 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_raw_developer (self, _tmp4_); -#line 7378 "Photo.c" +#line 7388 "Photo.c" } - __finally281: + __finally282: { GeeHashMap* _tmp5_ = NULL; -#line 907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 908 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->developments; -#line 907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 908 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7387 "Photo.c" +#line 7397 "Photo.c" } -#line 907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 908 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 908 "/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 907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 908 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 908 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 7397 "Photo.c" +#line 7407 "Photo.c" } } } static void _vala_array_add85 (BackingFileState*** array, int* length, int* size, BackingFileState* value) { -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 921 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 921 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 921 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7410 "Photo.c" +#line 7420 "Photo.c" } -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 921 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 921 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7416 "Photo.c" +#line 7426 "Photo.c" } static void _vala_array_add86 (BackingFileState*** array, int* length, int* size, BackingFileState* value) { -#line 922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 923 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 923 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 923 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7427 "Photo.c" +#line 7437 "Photo.c" } -#line 922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 923 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 923 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7433 "Photo.c" +#line 7443 "Photo.c" } static void _vala_array_add87 (BackingFileState*** array, int* length, int* size, BackingFileState* value) { -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 930 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 930 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 930 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7444 "Photo.c" +#line 7454 "Photo.c" } -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 930 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 930 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7450 "Photo.c" +#line 7460 "Photo.c" } @@ -7460,24 +7470,24 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, BackingFileState** _tmp27_ = NULL; gint _tmp27__length1 = 0; GError * _inner_error_ = NULL; -#line 917 "/home/jens/Source/shotwell/src/Photo.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 918 "/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" _tmp0_ = g_new0 (BackingFileState*, 0 + 1); -#line 918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 919 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp0_; -#line 918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 919 "/home/jens/Source/shotwell/src/Photo.vala" backing_length1 = 0; -#line 918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 919 "/home/jens/Source/shotwell/src/Photo.vala" _backing_size_ = backing_length1; -#line 7474 "Photo.c" +#line 7484 "Photo.c" { PhotoRow* _tmp1_ = NULL; -#line 919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 920 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 920 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 7481 "Photo.c" +#line 7491 "Photo.c" { BackingFileState** _tmp2_ = NULL; gint _tmp2__length1 = 0; @@ -7488,73 +7498,73 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, BackingFileState* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; gboolean _tmp12_ = FALSE; -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = backing; -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2__length1 = backing_length1; -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->master; -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->md5; -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = backing_file_state_new_from_photo_row (_tmp4_, _tmp6_); -#line 920 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add85 (&backing, &backing_length1, &_backing_size_, _tmp7_); #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" _tmp8_ = photo_has_editable (self); -#line 921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 922 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 7512 "Photo.c" +#line 7522 "Photo.c" BackingFileState** _tmp9_ = NULL; gint _tmp9__length1 = 0; BackingPhotoRow* _tmp10_ = NULL; BackingFileState* _tmp11_ = NULL; -#line 922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = backing; -#line 922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9__length1 = backing_length1; -#line 922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->priv->editable; -#line 922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = backing_file_state_new_from_photo_row (_tmp10_, NULL); -#line 922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 923 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add86 (&backing, &backing_length1, &_backing_size_, _tmp11_); -#line 7527 "Photo.c" +#line 7537 "Photo.c" } -#line 924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 925 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_is_developed (self); -#line 924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 925 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 7533 "Photo.c" +#line 7543 "Photo.c" GeeCollection* dev_rows = NULL; GeeCollection* _tmp13_ = NULL; GeeCollection* _tmp14_ = NULL; -#line 925 "/home/jens/Source/shotwell/src/Photo.vala" +#line 926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_get_raw_development_photo_rows (self); -#line 925 "/home/jens/Source/shotwell/src/Photo.vala" - dev_rows = _tmp13_; #line 926 "/home/jens/Source/shotwell/src/Photo.vala" + dev_rows = _tmp13_; +#line 927 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = dev_rows; -#line 926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 927 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 7545 "Photo.c" +#line 7555 "Photo.c" { GeeIterator* _r_it = NULL; GeeCollection* _tmp15_ = NULL; GeeIterator* _tmp16_ = NULL; -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = dev_rows; -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" _r_it = _tmp16_; -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 7558 "Photo.c" +#line 7568 "Photo.c" GeeIterator* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; BackingPhotoRow* r = NULL; @@ -7566,246 +7576,246 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, gint _tmp23__length1 = 0; BackingPhotoRow* _tmp24_ = NULL; BackingFileState* _tmp25_ = NULL; -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _r_it; -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = gee_iterator_next (_tmp17_); -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp18_) { -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 7578 "Photo.c" +#line 7588 "Photo.c" } -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _r_it; -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = gee_iterator_get (_tmp19_); -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" - r = (BackingPhotoRow*) _tmp20_; #line 928 "/home/jens/Source/shotwell/src/Photo.vala" + r = (BackingPhotoRow*) _tmp20_; +#line 929 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = r; -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 929 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_->filepath; -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:928: adding: %s", _tmp22_); #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" _tmp23_ = backing; -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23__length1 = backing_length1; -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = r; -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = backing_file_state_new_from_photo_row (_tmp24_, NULL); -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 930 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add87 (&backing, &backing_length1, &_backing_size_, _tmp25_); -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (r); -#line 7604 "Photo.c" +#line 7614 "Photo.c" } -#line 927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 928 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_r_it); -#line 7608 "Photo.c" +#line 7618 "Photo.c" } } -#line 924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 925 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dev_rows); -#line 7613 "Photo.c" +#line 7623 "Photo.c" } } - __finally282: + __finally283: { PhotoRow* _tmp26_ = NULL; -#line 919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 920 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = self->row; -#line 919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 920 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 7623 "Photo.c" +#line 7633 "Photo.c" } -#line 919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 920 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 920 "/home/jens/Source/shotwell/src/Photo.vala" backing = (_vala_array_free (backing, backing_length1, (GDestroyNotify) backing_file_state_unref), NULL); -#line 919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 920 "/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 919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 920 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 920 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7635 "Photo.c" +#line 7645 "Photo.c" } } -#line 935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 936 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = backing; -#line 935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 936 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27__length1 = backing_length1; -#line 935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 936 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { -#line 935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 936 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp27__length1; -#line 7646 "Photo.c" +#line 7656 "Photo.c" } -#line 935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 936 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp27_; -#line 935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 936 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7652 "Photo.c" +#line 7662 "Photo.c" } static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode) { PhotoFileReader* result = NULL; BackingFetchMode _tmp0_ = 0; -#line 938 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (IS_PHOTO (self), NULL); #line 939 "/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" _tmp0_ = mode; -#line 939 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" switch (_tmp0_) { -#line 939 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_MASTER: -#line 7667 "Photo.c" +#line 7677 "Photo.c" { PhotoFileReader* _tmp1_ = NULL; -#line 941 "/home/jens/Source/shotwell/src/Photo.vala" +#line 942 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_master_reader (self); -#line 941 "/home/jens/Source/shotwell/src/Photo.vala" +#line 942 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 941 "/home/jens/Source/shotwell/src/Photo.vala" +#line 942 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7676 "Photo.c" +#line 7686 "Photo.c" } -#line 939 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_BASELINE: -#line 7680 "Photo.c" +#line 7690 "Photo.c" { PhotoFileReader* _tmp2_ = NULL; -#line 944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 945 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_get_baseline_reader (self); -#line 944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 945 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 945 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7689 "Photo.c" +#line 7699 "Photo.c" } -#line 939 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_SOURCE: -#line 7693 "Photo.c" +#line 7703 "Photo.c" { PhotoFileReader* _tmp3_ = NULL; -#line 947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 948 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_source_reader (self); -#line 947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 948 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 948 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7702 "Photo.c" +#line 7712 "Photo.c" } -#line 939 "/home/jens/Source/shotwell/src/Photo.vala" +#line 940 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_UNMODIFIED: -#line 7706 "Photo.c" +#line 7716 "Photo.c" { PhotoFileFormat _tmp4_ = 0; -#line 950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 951 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_master_file_format (self); -#line 950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 951 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_ == PHOTO_FILE_FORMAT_RAW) { -#line 7713 "Photo.c" +#line 7723 "Photo.c" PhotoFileReader* _tmp5_ = NULL; -#line 951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 952 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_get_raw_developer_reader (self); -#line 951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 952 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 952 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7721 "Photo.c" +#line 7731 "Photo.c" } else { PhotoFileReader* _tmp6_ = NULL; -#line 953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_get_master_reader (self); -#line 953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 954 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp6_; -#line 953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 954 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7730 "Photo.c" +#line 7740 "Photo.c" } } default: { BackingFetchMode _tmp7_ = 0; GEnumValue* _tmp8_; -#line 956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = mode; -#line 956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_enum_get_value (g_type_class_ref (TYPE_BACKING_FETCH_MODE), _tmp7_); -#line 956 "/home/jens/Source/shotwell/src/Photo.vala" - g_error ("Photo.vala:956: Unknown backing fetch mode %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL); -#line 7743 "Photo.c" +#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 7753 "Photo.c" } } } static gpointer _photo_file_adapter_ref0 (gpointer self) { -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 963 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_file_adapter_ref (self) : NULL; -#line 7752 "Photo.c" +#line 7762 "Photo.c" } static PhotoFileReader* photo_get_master_reader (Photo* self) { PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; -#line 960 "/home/jens/Source/shotwell/src/Photo.vala" +#line 961 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 7761 "Photo.c" +#line 7771 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 962 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 962 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 7768 "Photo.c" +#line 7778 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; PhotoFileReader* _tmp3_ = NULL; -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 963 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 7781 "Photo.c" +#line 7791 "Photo.c" { PhotoBackingReaders* _tmp4_ = NULL; -#line 961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 962 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 962 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7788 "Photo.c" +#line 7798 "Photo.c" } -#line 962 "/home/jens/Source/shotwell/src/Photo.vala" +#line 963 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7792 "Photo.c" +#line 7802 "Photo.c" } - __finally283: + __finally284: { PhotoBackingReaders* _tmp5_ = NULL; -#line 961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 962 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->readers; -#line 961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 962 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7801 "Photo.c" +#line 7811 "Photo.c" } -#line 961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 962 "/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 961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 962 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 962 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7809 "Photo.c" +#line 7819 "Photo.c" } } @@ -7813,57 +7823,57 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) { PhotoFileReader* photo_get_editable_reader (Photo* self) { PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; -#line 966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 967 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 7819 "Photo.c" +#line 7829 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 968 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 7826 "Photo.c" +#line 7836 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; PhotoFileReader* _tmp3_ = NULL; -#line 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); -#line 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 969 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 7839 "Photo.c" +#line 7849 "Photo.c" { PhotoBackingReaders* _tmp4_ = NULL; -#line 967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 968 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7846 "Photo.c" +#line 7856 "Photo.c" } -#line 968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 969 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7850 "Photo.c" +#line 7860 "Photo.c" } - __finally284: + __finally285: { PhotoBackingReaders* _tmp5_ = NULL; -#line 967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->readers; -#line 967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 968 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7859 "Photo.c" +#line 7869 "Photo.c" } -#line 967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 968 "/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 967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 968 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 968 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7867 "Photo.c" +#line 7877 "Photo.c" } } @@ -7871,16 +7881,16 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) { static PhotoFileReader* photo_get_baseline_reader (Photo* self) { PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; -#line 973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 974 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 7877 "Photo.c" +#line 7887 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 7884 "Photo.c" +#line 7894 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -7889,105 +7899,105 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { PhotoBackingReaders* _tmp13_ = NULL; PhotoFileReader* _tmp14_ = NULL; PhotoFileReader* _tmp15_ = NULL; -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 976 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 976 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 976 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 7899 "Photo.c" +#line 7909 "Photo.c" PhotoBackingReaders* _tmp3_ = NULL; PhotoFileReader* _tmp4_ = NULL; PhotoFileReader* _tmp5_ = NULL; -#line 976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 977 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 977 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->editable; -#line 976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 977 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _photo_file_adapter_ref0 (_tmp4_); -#line 976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 977 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 7911 "Photo.c" +#line 7921 "Photo.c" { PhotoBackingReaders* _tmp6_ = NULL; -#line 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->readers; -#line 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7918 "Photo.c" +#line 7928 "Photo.c" } -#line 976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 977 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7922 "Photo.c" +#line 7932 "Photo.c" } -#line 978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 979 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; -#line 978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 979 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->developer; -#line 978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 979 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 7930 "Photo.c" +#line 7940 "Photo.c" PhotoBackingReaders* _tmp9_ = NULL; PhotoFileReader* _tmp10_ = NULL; PhotoFileReader* _tmp11_ = NULL; -#line 979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->priv->readers; -#line 979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->developer; -#line 979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _photo_file_adapter_ref0 (_tmp10_); -#line 979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 980 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp11_; -#line 7942 "Photo.c" +#line 7952 "Photo.c" { PhotoBackingReaders* _tmp12_ = NULL; -#line 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->readers; -#line 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7949 "Photo.c" +#line 7959 "Photo.c" } -#line 979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 980 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7953 "Photo.c" +#line 7963 "Photo.c" } -#line 981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->readers; -#line 981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->master; -#line 981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _photo_file_adapter_ref0 (_tmp14_); -#line 981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 982 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp15_; -#line 7963 "Photo.c" +#line 7973 "Photo.c" { PhotoBackingReaders* _tmp16_ = NULL; -#line 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->readers; -#line 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7970 "Photo.c" +#line 7980 "Photo.c" } -#line 981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 982 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7974 "Photo.c" +#line 7984 "Photo.c" } - __finally285: + __finally286: { PhotoBackingReaders* _tmp17_ = NULL; -#line 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->priv->readers; -#line 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7983 "Photo.c" +#line 7993 "Photo.c" } -#line 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 975 "/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 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 975 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 975 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7991 "Photo.c" +#line 8001 "Photo.c" } } @@ -7995,16 +8005,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 986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8001 "Photo.c" +#line 8011 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8008 "Photo.c" +#line 8018 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -8013,105 +8023,105 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { PhotoBackingReaders* _tmp13_ = NULL; PhotoFileReader* _tmp14_ = NULL; PhotoFileReader* _tmp15_ = NULL; -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 989 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 989 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 989 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8023 "Photo.c" +#line 8033 "Photo.c" PhotoBackingReaders* _tmp3_ = NULL; PhotoFileReader* _tmp4_ = NULL; PhotoFileReader* _tmp5_ = NULL; -#line 989 "/home/jens/Source/shotwell/src/Photo.vala" +#line 990 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 989 "/home/jens/Source/shotwell/src/Photo.vala" +#line 990 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->editable; -#line 989 "/home/jens/Source/shotwell/src/Photo.vala" +#line 990 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _photo_file_adapter_ref0 (_tmp4_); -#line 989 "/home/jens/Source/shotwell/src/Photo.vala" +#line 990 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 8035 "Photo.c" +#line 8045 "Photo.c" { PhotoBackingReaders* _tmp6_ = NULL; -#line 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->readers; -#line 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8042 "Photo.c" +#line 8052 "Photo.c" } -#line 989 "/home/jens/Source/shotwell/src/Photo.vala" +#line 990 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8046 "Photo.c" +#line 8056 "Photo.c" } -#line 991 "/home/jens/Source/shotwell/src/Photo.vala" +#line 992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; -#line 991 "/home/jens/Source/shotwell/src/Photo.vala" +#line 992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->developer; -#line 991 "/home/jens/Source/shotwell/src/Photo.vala" +#line 992 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 8054 "Photo.c" +#line 8064 "Photo.c" PhotoBackingReaders* _tmp9_ = NULL; PhotoFileReader* _tmp10_ = NULL; PhotoFileReader* _tmp11_ = NULL; -#line 992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 993 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->priv->readers; -#line 992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 993 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->developer; -#line 992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 993 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _photo_file_adapter_ref0 (_tmp10_); -#line 992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 993 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp11_; -#line 8066 "Photo.c" +#line 8076 "Photo.c" { PhotoBackingReaders* _tmp12_ = NULL; -#line 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->readers; -#line 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8073 "Photo.c" +#line 8083 "Photo.c" } -#line 992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 993 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8077 "Photo.c" +#line 8087 "Photo.c" } -#line 994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->readers; -#line 994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->master; -#line 994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _photo_file_adapter_ref0 (_tmp14_); -#line 994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 995 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp15_; -#line 8087 "Photo.c" +#line 8097 "Photo.c" { PhotoBackingReaders* _tmp16_ = NULL; -#line 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->readers; -#line 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8094 "Photo.c" +#line 8104 "Photo.c" } -#line 994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 995 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8098 "Photo.c" +#line 8108 "Photo.c" } - __finally286: + __finally287: { PhotoBackingReaders* _tmp17_ = NULL; -#line 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->priv->readers; -#line 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8107 "Photo.c" +#line 8117 "Photo.c" } -#line 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/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 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 988 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8115 "Photo.c" +#line 8125 "Photo.c" } } @@ -8119,57 +8129,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 999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1000 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8125 "Photo.c" +#line 8135 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 1000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8132 "Photo.c" +#line 8142 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; PhotoFileReader* _tmp3_ = NULL; -#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->developer; -#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); -#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1002 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8145 "Photo.c" +#line 8155 "Photo.c" { PhotoBackingReaders* _tmp4_ = NULL; -#line 1000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8152 "Photo.c" +#line 8162 "Photo.c" } -#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1002 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8156 "Photo.c" +#line 8166 "Photo.c" } - __finally287: + __finally288: { PhotoBackingReaders* _tmp5_ = NULL; -#line 1000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->readers; -#line 1000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8165 "Photo.c" +#line 8175 "Photo.c" } -#line 1000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/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 1000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1001 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8173 "Photo.c" +#line 8183 "Photo.c" } } @@ -8177,54 +8187,54 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { gboolean photo_is_developed (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 1005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1006 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8183 "Photo.c" +#line 8193 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 1006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1006 "/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 8190 "Photo.c" +#line 8200 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; -#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1008 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1008 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->developer; -#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1008 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8200 "Photo.c" +#line 8210 "Photo.c" { PhotoBackingReaders* _tmp3_ = NULL; -#line 1006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 1006 "/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 8207 "Photo.c" +#line 8217 "Photo.c" } -#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1008 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8211 "Photo.c" +#line 8221 "Photo.c" } - __finally288: + __finally289: { PhotoBackingReaders* _tmp4_ = NULL; -#line 1006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1006 "/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 8220 "Photo.c" +#line 8230 "Photo.c" } -#line 1006 "/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 1006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1007 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 8228 "Photo.c" +#line 8238 "Photo.c" } } @@ -8232,54 +8242,54 @@ gboolean photo_is_developed (Photo* self) { gboolean photo_has_editable (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 1011 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8238 "Photo.c" +#line 8248 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8245 "Photo.c" +#line 8255 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; -#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1014 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8255 "Photo.c" +#line 8265 "Photo.c" { PhotoBackingReaders* _tmp3_ = NULL; -#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8262 "Photo.c" +#line 8272 "Photo.c" } -#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1014 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8266 "Photo.c" +#line 8276 "Photo.c" } - __finally289: + __finally290: { PhotoBackingReaders* _tmp4_ = NULL; -#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8275 "Photo.c" +#line 8285 "Photo.c" } -#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1013 "/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 1012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1013 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 8283 "Photo.c" +#line 8293 "Photo.c" } } @@ -8287,57 +8297,57 @@ gboolean photo_has_editable (Photo* self) { gboolean photo_does_master_exist (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 1017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1018 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8293 "Photo.c" +#line 8303 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 1018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8300 "Photo.c" +#line 8310 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; -#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/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 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8313 "Photo.c" +#line 8323 "Photo.c" { PhotoBackingReaders* _tmp4_ = NULL; -#line 1018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8320 "Photo.c" +#line 8330 "Photo.c" } -#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1020 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8324 "Photo.c" +#line 8334 "Photo.c" } - __finally290: + __finally291: { PhotoBackingReaders* _tmp5_ = NULL; -#line 1018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->readers; -#line 1018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8333 "Photo.c" +#line 8343 "Photo.c" } -#line 1018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1019 "/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 1018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1019 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 8341 "Photo.c" +#line 8351 "Photo.c" } } @@ -8345,75 +8355,75 @@ gboolean photo_does_master_exist (Photo* self) { gboolean photo_does_editable_exist (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 1024 "/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 8351 "Photo.c" +#line 8361 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 1025 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1025 "/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 8358 "Photo.c" +#line 8368 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoBackingReaders* _tmp2_ = NULL; PhotoFileReader* _tmp3_ = NULL; -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->readers; -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->editable; -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 8369 "Photo.c" +#line 8379 "Photo.c" PhotoBackingReaders* _tmp4_ = NULL; PhotoFileReader* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->editable; -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/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 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp6_; -#line 8381 "Photo.c" +#line 8391 "Photo.c" } else { -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 8385 "Photo.c" +#line 8395 "Photo.c" } -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 8389 "Photo.c" +#line 8399 "Photo.c" { PhotoBackingReaders* _tmp7_ = NULL; -#line 1025 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; -#line 1025 "/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 8396 "Photo.c" +#line 8406 "Photo.c" } -#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1027 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8400 "Photo.c" +#line 8410 "Photo.c" } - __finally291: + __finally292: { PhotoBackingReaders* _tmp8_ = NULL; -#line 1025 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->priv->readers; -#line 1025 "/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 8409 "Photo.c" +#line 8419 "Photo.c" } -#line 1025 "/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 1025 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1025 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1026 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 8417 "Photo.c" +#line 8427 "Photo.c" } } @@ -8421,54 +8431,54 @@ gboolean photo_does_editable_exist (Photo* self) { gboolean photo_is_master_baseline (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 1030 "/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 8427 "Photo.c" +#line 8437 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 1031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1031 "/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 8434 "Photo.c" +#line 8444 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; -#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1033 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ == NULL; -#line 8444 "Photo.c" +#line 8454 "Photo.c" { PhotoBackingReaders* _tmp3_ = NULL; -#line 1031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 1031 "/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 8451 "Photo.c" +#line 8461 "Photo.c" } -#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1033 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8455 "Photo.c" +#line 8465 "Photo.c" } - __finally292: + __finally293: { PhotoBackingReaders* _tmp4_ = NULL; -#line 1031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1031 "/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 8464 "Photo.c" +#line 8474 "Photo.c" } -#line 1031 "/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 1031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1032 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 8472 "Photo.c" +#line 8482 "Photo.c" } } @@ -8476,69 +8486,69 @@ gboolean photo_is_master_baseline (Photo* self) { gboolean photo_is_master_source (Photo* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 1036 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 1037 "/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" _tmp0_ = photo_has_editable (self); -#line 1037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1038 "/home/jens/Source/shotwell/src/Photo.vala" result = !_tmp0_; -#line 1037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1038 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8488 "Photo.c" +#line 8498 "Photo.c" } gboolean photo_is_editable_baseline (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 1040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1041 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8497 "Photo.c" +#line 8507 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 1041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 1041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8504 "Photo.c" +#line 8514 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; -#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1043 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1043 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1043 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8514 "Photo.c" +#line 8524 "Photo.c" { PhotoBackingReaders* _tmp3_ = NULL; -#line 1041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 1041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8521 "Photo.c" +#line 8531 "Photo.c" } -#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1043 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8525 "Photo.c" +#line 8535 "Photo.c" } - __finally293: + __finally294: { PhotoBackingReaders* _tmp4_ = NULL; -#line 1041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8534 "Photo.c" +#line 8544 "Photo.c" } -#line 1041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1042 "/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 1041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1042 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 8542 "Photo.c" +#line 8552 "Photo.c" } } @@ -8546,72 +8556,72 @@ gboolean photo_is_editable_baseline (Photo* self) { gboolean photo_is_editable_source (Photo* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 1046 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 1047 "/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" _tmp0_ = photo_has_editable (self); -#line 1047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1048 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 1047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1048 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8558 "Photo.c" +#line 8568 "Photo.c" } BackingPhotoRow* photo_get_master_photo_row (Photo* self) { BackingPhotoRow* result = NULL; GError * _inner_error_ = NULL; -#line 1050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8567 "Photo.c" +#line 8577 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8574 "Photo.c" +#line 8584 "Photo.c" { PhotoRow* _tmp1_ = NULL; BackingPhotoRow* _tmp2_ = NULL; BackingPhotoRow* _tmp3_ = NULL; -#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1053 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1053 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; -#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1053 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _backing_photo_row_ref0 (_tmp2_); -#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1053 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8587 "Photo.c" +#line 8597 "Photo.c" { PhotoRow* _tmp4_ = NULL; -#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8594 "Photo.c" +#line 8604 "Photo.c" } -#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1053 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8598 "Photo.c" +#line 8608 "Photo.c" } - __finally294: + __finally295: { PhotoRow* _tmp5_ = NULL; -#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8607 "Photo.c" +#line 8617 "Photo.c" } -#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1052 "/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 1051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1052 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8615 "Photo.c" +#line 8625 "Photo.c" } } @@ -8619,79 +8629,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 1056 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8625 "Photo.c" +#line 8635 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8632 "Photo.c" +#line 8642 "Photo.c" { PhotoRow* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 1059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1060 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 1059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1060 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = backing_photo_id_is_valid (&_tmp1_->editable_id); -#line 1059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1060 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 8642 "Photo.c" +#line 8652 "Photo.c" BackingPhotoRow* _tmp3_ = NULL; BackingPhotoRow* _tmp4_ = NULL; -#line 1060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->editable; -#line 1060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _backing_photo_row_ref0 (_tmp3_); -#line 1060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 8651 "Photo.c" +#line 8661 "Photo.c" { PhotoRow* _tmp5_ = NULL; -#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8658 "Photo.c" +#line 8668 "Photo.c" } -#line 1060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1061 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8662 "Photo.c" +#line 8672 "Photo.c" } else { -#line 1062 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1063 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 8666 "Photo.c" +#line 8676 "Photo.c" { PhotoRow* _tmp6_ = NULL; -#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8673 "Photo.c" +#line 8683 "Photo.c" } -#line 1062 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1063 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8677 "Photo.c" +#line 8687 "Photo.c" } } - __finally295: + __finally296: { PhotoRow* _tmp7_ = NULL; -#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8687 "Photo.c" +#line 8697 "Photo.c" } -#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1058 "/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 1057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1058 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8695 "Photo.c" +#line 8705 "Photo.c" } } @@ -8699,76 +8709,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 1066 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8705 "Photo.c" +#line 8715 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8712 "Photo.c" +#line 8722 "Photo.c" { GeeCollection* _tmp1_ = NULL; GeeHashMap* _tmp2_ = NULL; -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->developments; -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8720 "Photo.c" +#line 8730 "Photo.c" GeeHashMap* _tmp3_ = NULL; GeeCollection* _tmp4_ = NULL; GeeCollection* _tmp5_ = NULL; -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->developments; -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MAP, GeeMap)); -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp5_; -#line 8734 "Photo.c" +#line 8744 "Photo.c" } else { -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 8740 "Photo.c" +#line 8750 "Photo.c" } -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 8744 "Photo.c" +#line 8754 "Photo.c" { PhotoRow* _tmp6_ = NULL; -#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8751 "Photo.c" +#line 8761 "Photo.c" } -#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1069 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8755 "Photo.c" +#line 8765 "Photo.c" } - __finally296: + __finally297: { PhotoRow* _tmp7_ = NULL; -#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8764 "Photo.c" +#line 8774 "Photo.c" } -#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1068 "/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 1067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1068 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8772 "Photo.c" +#line 8782 "Photo.c" } } @@ -8776,96 +8786,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 1072 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1073 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8782 "Photo.c" +#line 8792 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 1073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8789 "Photo.c" +#line 8799 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; GeeHashMap* _tmp2_ = NULL; -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->developments; -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8797 "Photo.c" +#line 8807 "Photo.c" GeeHashMap* _tmp3_ = NULL; RawDeveloper _tmp4_ = 0; gpointer _tmp5_ = NULL; -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->developments; -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = d; -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1075 "/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 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = (BackingPhotoRow*) _tmp5_; -#line 8811 "Photo.c" +#line 8821 "Photo.c" } else { -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 8817 "Photo.c" +#line 8827 "Photo.c" } -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 8821 "Photo.c" +#line 8831 "Photo.c" { PhotoRow* _tmp6_ = NULL; -#line 1073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 1073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8828 "Photo.c" +#line 8838 "Photo.c" } -#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1075 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8832 "Photo.c" +#line 8842 "Photo.c" } - __finally297: + __finally298: { PhotoRow* _tmp7_ = NULL; -#line 1073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 1073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8841 "Photo.c" +#line 8851 "Photo.c" } -#line 1073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1074 "/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 1073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1074 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8849 "Photo.c" +#line 8859 "Photo.c" } } static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) { PhotoFileFormat* dup; -#line 1084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" dup = g_new0 (PhotoFileFormat, 1); -#line 1084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" memcpy (dup, self, sizeof (PhotoFileFormat)); -#line 1084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" return dup; -#line 8862 "Photo.c" +#line 8872 "Photo.c" } static gpointer __photo_file_format_dup0 (gpointer self) { -#line 1084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" return self ? _photo_file_format_dup (self) : NULL; -#line 8869 "Photo.c" +#line 8879 "Photo.c" } @@ -8877,37 +8887,37 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) { PhotoFileReader* _tmp2_ = NULL; PhotoFileFormat _tmp3_ = 0; PhotoFileFormat* _tmp4_ = NULL; -#line 1078 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (IS_PHOTO (self), NULL); #line 1079 "/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" _tmp0_ = photo_get_editable_reader (self); -#line 1079 "/home/jens/Source/shotwell/src/Photo.vala" - reader = _tmp0_; #line 1080 "/home/jens/Source/shotwell/src/Photo.vala" + reader = _tmp0_; +#line 1081 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = reader; -#line 1080 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_ == NULL) { #line 1081 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp1_ == NULL) { +#line 1082 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 1081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1082 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 1081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1082 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8897 "Photo.c" +#line 8907 "Photo.c" } -#line 1084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; -#line 1084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1085 "/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 1084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = __photo_file_format_dup0 (&_tmp3_); -#line 1084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 1084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 1084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1085 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8911 "Photo.c" +#line 8921 "Photo.c" } @@ -8917,75 +8927,75 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma PhotoFileFormat _tmp0_ = 0; ExportFormatParameters _tmp1_ = {0}; ExportFormatMode _tmp2_ = 0; -#line 1087 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 1087 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (params != NULL, 0); #line 1088 "/home/jens/Source/shotwell/src/Photo.vala" + g_return_val_if_fail (params != NULL, 0); +#line 1089 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_file_format_get_system_default_format (); -#line 1088 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1089 "/home/jens/Source/shotwell/src/Photo.vala" _result_ = _tmp0_; -#line 1090 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1091 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *params; -#line 1090 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1091 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_.mode; -#line 1090 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1091 "/home/jens/Source/shotwell/src/Photo.vala" switch (_tmp2_) { -#line 1090 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1091 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_UNMODIFIED: -#line 8937 "Photo.c" +#line 8947 "Photo.c" { PhotoFileFormat _tmp3_ = 0; -#line 1092 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1093 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_master_file_format (self); -#line 1092 "/home/jens/Source/shotwell/src/Photo.vala" - _result_ = _tmp3_; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" + _result_ = _tmp3_; +#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 8946 "Photo.c" +#line 8956 "Photo.c" } -#line 1090 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1091 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_CURRENT: -#line 8950 "Photo.c" +#line 8960 "Photo.c" { PhotoFileFormat _tmp4_ = 0; -#line 1096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1097 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_best_export_file_format (self); -#line 1096 "/home/jens/Source/shotwell/src/Photo.vala" - _result_ = _tmp4_; #line 1097 "/home/jens/Source/shotwell/src/Photo.vala" + _result_ = _tmp4_; +#line 1098 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 8959 "Photo.c" +#line 8969 "Photo.c" } -#line 1090 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1091 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_SPECIFIED: -#line 8963 "Photo.c" +#line 8973 "Photo.c" { ExportFormatParameters _tmp5_ = {0}; PhotoFileFormat _tmp6_ = 0; -#line 1100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = *params; -#line 1100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_.specified_format; -#line 1100 "/home/jens/Source/shotwell/src/Photo.vala" - _result_ = _tmp6_; #line 1101 "/home/jens/Source/shotwell/src/Photo.vala" + _result_ = _tmp6_; +#line 1102 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 8975 "Photo.c" +#line 8985 "Photo.c" } default: { -#line 1104 "/home/jens/Source/shotwell/src/Photo.vala" - g_error ("Photo.vala:1104: get_export_format_for_parameters: unsupported export " \ +#line 1105 "/home/jens/Source/shotwell/src/Photo.vala" + g_error ("Photo.vala:1105: get_export_format_for_parameters: unsupported export " \ "format mode"); -#line 8981 "Photo.c" +#line 8991 "Photo.c" } } -#line 1107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1108 "/home/jens/Source/shotwell/src/Photo.vala" result = _result_; -#line 1107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1108 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8988 "Photo.c" +#line 8998 "Photo.c" } @@ -8995,81 +9005,81 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame ExportFormatParameters _tmp0_ = {0}; ExportFormatMode _tmp1_ = 0; const gchar* _tmp8_ = NULL; -#line 1110 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1111 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 1110 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (params != NULL, NULL); #line 1111 "/home/jens/Source/shotwell/src/Photo.vala" + g_return_val_if_fail (params != NULL, NULL); +#line 1112 "/home/jens/Source/shotwell/src/Photo.vala" _result_ = NULL; -#line 1113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1114 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = *params; -#line 1113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1114 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_.mode; -#line 1113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1114 "/home/jens/Source/shotwell/src/Photo.vala" switch (_tmp1_) { -#line 1113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1114 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_UNMODIFIED: -#line 9012 "Photo.c" +#line 9022 "Photo.c" { GFile* _tmp2_ = NULL; GFile* _tmp3_ = NULL; gchar* _tmp4_ = NULL; -#line 1115 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1115 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1115 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = g_file_get_basename (_tmp3_); -#line 1115 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_result_); -#line 1115 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" _result_ = _tmp4_; -#line 1115 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); #line 1116 "/home/jens/Source/shotwell/src/Photo.vala" + _g_object_unref0 (_tmp3_); +#line 1117 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9031 "Photo.c" +#line 9041 "Photo.c" } -#line 1113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1114 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_CURRENT: -#line 1113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1114 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_SPECIFIED: -#line 9037 "Photo.c" +#line 9047 "Photo.c" { ExportFormatParameters _tmp5_ = {0}; PhotoFileFormat _tmp6_ = 0; gchar* _tmp7_ = NULL; -#line 1120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1121 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = *params; -#line 1120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1121 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_get_export_format_for_parameters (self, &_tmp5_); -#line 1120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1121 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_get_export_basename (self, &_tmp6_); -#line 1120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1121 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp7_; -#line 1120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1121 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_result_); -#line 1120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1121 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9054 "Photo.c" +#line 9064 "Photo.c" } default: { -#line 1123 "/home/jens/Source/shotwell/src/Photo.vala" - g_error ("Photo.vala:1123: get_export_basename_for_parameters: unsupported expor" \ +#line 1124 "/home/jens/Source/shotwell/src/Photo.vala" + g_error ("Photo.vala:1124: get_export_basename_for_parameters: unsupported expor" \ "t format mode"); -#line 9060 "Photo.c" +#line 9070 "Photo.c" } } -#line 1126 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1127 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _result_; -#line 1126 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp8_ != NULL, "result != null"); #line 1127 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_assert (_tmp8_ != NULL, "result != null"); +#line 1128 "/home/jens/Source/shotwell/src/Photo.vala" result = _result_; -#line 1127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1128 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9071 "Photo.c" +#line 9081 "Photo.c" } @@ -9198,243 +9208,243 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { PhotoImportParams* _tmp176_ = NULL; Thumbnails* _tmp177_ = NULL; GError * _inner_error_ = NULL; -#line 1142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1143 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0); -#line 1146 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1147 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = params; -#line 1146 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1147 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_->file; -#line 1146 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1147 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 1146 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1147 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp2_; -#line 1148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1149 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 9212 "Photo.c" +#line 9222 "Photo.c" { GFileInfo* _tmp3_ = NULL; GFile* _tmp4_ = NULL; GFileInfo* _tmp5_ = NULL; GFileInfo* _tmp6_ = NULL; -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = file; -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1151 "/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 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp5_; -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9226 "Photo.c" - goto __catch298_g_error; +#line 9236 "Photo.c" + goto __catch299_g_error; } -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp3_; -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = NULL; -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1151 "/home/jens/Source/shotwell/src/Photo.vala" info = _tmp6_; -#line 1149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 9239 "Photo.c" +#line 9249 "Photo.c" } - goto __finally298; - __catch298_g_error: + goto __finally299; + __catch299_g_error: { GError* err = NULL; -#line 1149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1154 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_FILE_ERROR; -#line 1153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1154 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 1153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1154 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1154 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1154 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9259 "Photo.c" +#line 9269 "Photo.c" } - __finally298: -#line 1149 "/home/jens/Source/shotwell/src/Photo.vala" + __finally299: +#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1150 "/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 1149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1150 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 9274 "Photo.c" +#line 9284 "Photo.c" } -#line 1156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1157 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = info; -#line 1156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1157 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_file_info_get_file_type (_tmp7_); -#line 1156 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_ != G_FILE_TYPE_REGULAR) { #line 1157 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp8_ != G_FILE_TYPE_REGULAR) { +#line 1158 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_NOT_A_FILE; -#line 1157 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1158 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1157 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1158 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1157 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1158 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9290 "Photo.c" +#line 9300 "Photo.c" } -#line 1159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1160 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = file; -#line 1159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1160 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_is_file_image (_tmp9_); -#line 1159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1160 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp10_) { -#line 9298 "Photo.c" +#line 9308 "Photo.c" GFile* _tmp11_ = NULL; gchar* _tmp12_ = NULL; gchar* _tmp13_ = NULL; -#line 1160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1161 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = file; -#line 1160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1161 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = g_file_get_path (_tmp11_); -#line 1160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1161 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 1160 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:1160: Not importing %s: Not an image file", _tmp13_); -#line 1160 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp13_); -#line 1162 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1163 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_NOT_AN_IMAGE; -#line 1162 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1163 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1162 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1163 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1162 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1163 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9320 "Photo.c" +#line 9330 "Photo.c" } -#line 1165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = file; -#line 1165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_file_format_is_file_supported (_tmp14_); -#line 1165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp15_) { -#line 9328 "Photo.c" +#line 9338 "Photo.c" GFile* _tmp16_ = NULL; gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; -#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = file; -#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = g_file_get_path (_tmp16_); -#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_; -#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:1166: Not importing %s: Unsupported extension", _tmp18_); -#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp18_); -#line 1168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; -#line 1168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1169 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9350 "Photo.c" +#line 9360 "Photo.c" } -#line 1171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1172 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = info; -#line 1171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1172 "/home/jens/Source/shotwell/src/Photo.vala" g_file_info_get_modification_time (_tmp19_, &_tmp20_); -#line 1171 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1172 "/home/jens/Source/shotwell/src/Photo.vala" timestamp = _tmp20_; -#line 1174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = params; -#line 1174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_->exif_md5; -#line 1174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_ != NULL) { -#line 9364 "Photo.c" +#line 9374 "Photo.c" PhotoImportParams* _tmp25_ = NULL; const gchar* _tmp26_ = NULL; -#line 1174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = params; -#line 1174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_->thumbnail_md5; -#line 1174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp26_ != NULL; -#line 9373 "Photo.c" +#line 9383 "Photo.c" } else { -#line 1174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = FALSE; -#line 9377 "Photo.c" +#line 9387 "Photo.c" } -#line 1174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_) { -#line 9381 "Photo.c" +#line 9391 "Photo.c" PhotoImportParams* _tmp27_ = NULL; const gchar* _tmp28_ = NULL; -#line 1174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = params; -#line 1174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_->full_md5; -#line 1174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp28_ != NULL; -#line 9390 "Photo.c" +#line 9400 "Photo.c" } else { -#line 1174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = FALSE; -#line 9394 "Photo.c" +#line 9404 "Photo.c" } -#line 1174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 9398 "Photo.c" +#line 9408 "Photo.c" PhotoImportParams* _tmp29_ = NULL; PhotoImportParams* _tmp30_ = NULL; PhotoFileSnifferOptions _tmp31_ = 0; -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1176 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = params; -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1176 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = params; -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1176 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_->sniffer_options; -#line 1175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1176 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_->sniffer_options = _tmp31_ | PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5; -#line 9410 "Photo.c" +#line 9420 "Photo.c" } -#line 1178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = file; -#line 1178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = params; -#line 1178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_->sniffer_options; -#line 1178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_file_interrogator_new (_tmp32_, _tmp34_); -#line 1178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" interrogator = _tmp35_; -#line 9422 "Photo.c" +#line 9432 "Photo.c" { PhotoFileInterrogator* _tmp36_ = NULL; -#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1181 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = interrogator; -#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1181 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (_tmp36_, &_inner_error_); -#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1181 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9431 "Photo.c" - goto __catch299_g_error; +#line 9441 "Photo.c" + goto __catch300_g_error; } } - goto __finally299; - __catch299_g_error: + goto __finally300; + __catch300_g_error: { GError* err = NULL; GFile* _tmp37_ = NULL; @@ -9442,120 +9452,120 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { gchar* _tmp39_ = NULL; GError* _tmp40_ = NULL; const gchar* _tmp41_ = NULL; -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1182 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = file; -#line 1182 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = g_file_get_path (_tmp37_); -#line 1182 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp38_; -#line 1182 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = err; -#line 1182 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_->message; -#line 1182 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1182: Unable to interrogate photo file %s: %s", _tmp39_, _tmp41_); -#line 1182 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp39_); -#line 1184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_DECODE_ERROR; -#line 1184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 1184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9474 "Photo.c" +#line 9484 "Photo.c" } - __finally299: -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" + __finally300: +#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1180 "/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 1179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1180 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 9491 "Photo.c" +#line 9501 "Photo.c" } -#line 1187 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1188 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = interrogator; -#line 1187 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1188 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = photo_file_interrogator_get_is_photo_corrupted (_tmp42_); -#line 1187 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp43_) { #line 1188 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp43_) { +#line 1189 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_NOT_AN_IMAGE; -#line 1188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1189 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1189 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1189 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1189 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9509 "Photo.c" +#line 9519 "Photo.c" } -#line 1191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1192 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = interrogator; -#line 1191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1192 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = photo_file_interrogator_get_detected_photo_information (_tmp44_); -#line 1191 "/home/jens/Source/shotwell/src/Photo.vala" - detected = _tmp45_; #line 1192 "/home/jens/Source/shotwell/src/Photo.vala" + detected = _tmp45_; +#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = detected; -#line 1192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp47_ == NULL) { -#line 1192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = TRUE; -#line 9523 "Photo.c" +#line 9533 "Photo.c" } else { DetectedPhotoInformation* _tmp48_ = NULL; PhotoFileFormat _tmp49_ = 0; -#line 1192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = detected; -#line 1192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = _tmp48_->file_format; -#line 1192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = _tmp49_ == PHOTO_FILE_FORMAT_UNKNOWN; -#line 9533 "Photo.c" +#line 9543 "Photo.c" } -#line 1192 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp46_) { #line 1193 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp46_) { +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; -#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9549 "Photo.c" +#line 9559 "Photo.c" } -#line 1196 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1197 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = params; -#line 1196 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1197 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = _tmp50_->sniffer_options; -#line 1196 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1197 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp51_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) != 0) { -#line 9557 "Photo.c" +#line 9567 "Photo.c" DetectedPhotoInformation* _tmp52_ = NULL; PhotoImportParams* _tmp53_ = NULL; const gchar* _tmp54_ = NULL; @@ -9568,65 +9578,65 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { PhotoImportParams* _tmp61_ = NULL; const gchar* _tmp62_ = NULL; gchar* _tmp63_ = NULL; -#line 1197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = detected; -#line 1197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = params; -#line 1197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = _tmp53_->exif_md5; -#line 1197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = g_strdup (_tmp54_); -#line 1197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp52_->exif_md5); -#line 1197 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_->exif_md5 = _tmp55_; #line 1198 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp52_->exif_md5 = _tmp55_; +#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = detected; -#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = params; -#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = _tmp57_->thumbnail_md5; -#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = g_strdup (_tmp58_); -#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp56_->thumbnail_md5); -#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_->thumbnail_md5 = _tmp59_; #line 1199 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp56_->thumbnail_md5 = _tmp59_; +#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = detected; -#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = params; -#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = _tmp61_->full_md5; -#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = g_strdup (_tmp62_); -#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp60_->md5); -#line 1199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1200 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_->md5 = _tmp63_; -#line 9606 "Photo.c" +#line 9616 "Photo.c" } -#line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = ORIENTATION_TOP_LEFT; #line 1203 "/home/jens/Source/shotwell/src/Photo.vala" - exposure_time = (time_t) 0; + orientation = ORIENTATION_TOP_LEFT; #line 1204 "/home/jens/Source/shotwell/src/Photo.vala" + exposure_time = (time_t) 0; +#line 1205 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = g_strdup (""); -#line 1204 "/home/jens/Source/shotwell/src/Photo.vala" - title = _tmp64_; #line 1205 "/home/jens/Source/shotwell/src/Photo.vala" + title = _tmp64_; +#line 1206 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = g_strdup (""); -#line 1205 "/home/jens/Source/shotwell/src/Photo.vala" - comment = _tmp65_; #line 1206 "/home/jens/Source/shotwell/src/Photo.vala" + comment = _tmp65_; +#line 1207 "/home/jens/Source/shotwell/src/Photo.vala" rating = RATING_UNRATED; -#line 1213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1214 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = detected; -#line 1213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1214 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = _tmp66_->metadata; -#line 1213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1214 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp67_ != NULL) { -#line 9628 "Photo.c" +#line 9638 "Photo.c" MetadataDateTime* date_time = NULL; DetectedPhotoInformation* _tmp68_ = NULL; PhotoMetadata* _tmp69_ = NULL; @@ -9648,362 +9658,362 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { DetectedPhotoInformation* _tmp87_ = NULL; PhotoMetadata* _tmp88_ = NULL; Rating _tmp89_ = 0; -#line 1214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1215 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = detected; -#line 1214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1215 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = _tmp68_->metadata; -#line 1214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1215 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = photo_metadata_get_exposure_date_time (_tmp69_); -#line 1214 "/home/jens/Source/shotwell/src/Photo.vala" - date_time = _tmp70_; #line 1215 "/home/jens/Source/shotwell/src/Photo.vala" + date_time = _tmp70_; +#line 1216 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = date_time; -#line 1215 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1216 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp71_ != NULL) { -#line 9662 "Photo.c" +#line 9672 "Photo.c" MetadataDateTime* _tmp72_ = NULL; time_t _tmp73_ = 0; -#line 1216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = date_time; -#line 1216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = metadata_date_time_get_timestamp (_tmp72_); -#line 1216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" exposure_time = _tmp73_; -#line 9671 "Photo.c" +#line 9681 "Photo.c" } -#line 1218 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = detected; -#line 1218 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = _tmp74_->metadata; -#line 1218 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = photo_metadata_get_orientation (_tmp75_); -#line 1218 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp76_; #line 1219 "/home/jens/Source/shotwell/src/Photo.vala" + orientation = _tmp76_; +#line 1220 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = detected; -#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1220 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = _tmp77_->metadata; -#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1220 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1220 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" - title = _tmp79_; #line 1220 "/home/jens/Source/shotwell/src/Photo.vala" + title = _tmp79_; +#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = detected; -#line 1220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = _tmp80_->metadata; -#line 1220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 1220 "/home/jens/Source/shotwell/src/Photo.vala" - comment = _tmp82_; #line 1221 "/home/jens/Source/shotwell/src/Photo.vala" + comment = _tmp82_; +#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = params; -#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = detected; -#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = _tmp84_->metadata; -#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = photo_metadata_get_keywords (_tmp85_, NULL, NULL, NULL); -#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp83_->keywords); -#line 1221 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_->keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GEE_TYPE_COLLECTION, GeeCollection); #line 1222 "/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" _tmp87_ = detected; -#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = _tmp87_->metadata; -#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = photo_metadata_get_rating (_tmp88_); -#line 1222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1223 "/home/jens/Source/shotwell/src/Photo.vala" rating = _tmp89_; -#line 1213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1214 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 9723 "Photo.c" +#line 9733 "Photo.c" } -#line 1226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = detected; -#line 1226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = _tmp92_->colorspace; -#line 1226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp93_ != GDK_COLORSPACE_RGB) { -#line 1226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = TRUE; -#line 9733 "Photo.c" +#line 9743 "Photo.c" } else { DetectedPhotoInformation* _tmp94_ = NULL; gint _tmp95_ = 0; -#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1228 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = detected; -#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1228 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = _tmp94_->channels; -#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1228 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = _tmp95_ < 3; -#line 9743 "Photo.c" +#line 9753 "Photo.c" } -#line 1226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp91_) { -#line 1226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = TRUE; -#line 9749 "Photo.c" +#line 9759 "Photo.c" } else { DetectedPhotoInformation* _tmp96_ = NULL; gint _tmp97_ = 0; -#line 1228 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1229 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = detected; -#line 1228 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1229 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = _tmp96_->bits_per_channel; -#line 1228 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1229 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tmp97_ != 8; -#line 9759 "Photo.c" +#line 9769 "Photo.c" } -#line 1226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1227 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp90_) { -#line 9763 "Photo.c" +#line 9773 "Photo.c" GFile* _tmp98_ = NULL; gchar* _tmp99_ = NULL; gchar* _tmp100_ = NULL; -#line 1229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1230 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = file; -#line 1229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1230 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = g_file_get_path (_tmp98_); -#line 1229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1230 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = _tmp99_; -#line 1229 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:1229: Not importing %s: Unsupported color format", _tmp100_); -#line 1229 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp100_); -#line 1231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; -#line 1231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 1231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 1231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1232 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9793 "Photo.c" +#line 9803 "Photo.c" } -#line 1237 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = params; -#line 1237 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = _tmp101_->row; -#line 1237 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id_init (&_tmp102_->photo_id, PHOTO_ID_INVALID); #line 1238 "/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" _tmp103_ = params; -#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = _tmp103_->row; -#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" _tmp105_ = _tmp104_->master; -#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = file; -#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" _tmp107_ = g_file_get_path (_tmp106_); -#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp105_->filepath); -#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_->filepath = _tmp107_; #line 1239 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp105_->filepath = _tmp107_; +#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = params; -#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp109_ = _tmp108_->row; -#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110_ = _tmp109_->master; -#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp111_ = detected; -#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp112_ = _tmp111_->image_dim; -#line 1239 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_->dim = _tmp112_; #line 1240 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp110_->dim = _tmp112_; +#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = params; -#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_ = _tmp113_->row; -#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp115_ = _tmp114_->master; -#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp116_ = info; -#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp117_ = g_file_info_get_size (_tmp116_); -#line 1240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_->filesize = _tmp117_; #line 1241 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp115_->filesize = _tmp117_; +#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp118_ = params; -#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp119_ = _tmp118_->row; -#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp120_ = _tmp119_->master; -#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = timestamp; -#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp122_ = _tmp121_.tv_sec; -#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_->timestamp = (time_t) _tmp122_; #line 1242 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp120_->timestamp = (time_t) _tmp122_; +#line 1243 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = params; -#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1243 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124_ = _tmp123_->row; -#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1243 "/home/jens/Source/shotwell/src/Photo.vala" _tmp125_ = exposure_time; -#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_->exposure_time = _tmp125_; #line 1243 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp124_->exposure_time = _tmp125_; +#line 1244 "/home/jens/Source/shotwell/src/Photo.vala" _tmp126_ = params; -#line 1243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1244 "/home/jens/Source/shotwell/src/Photo.vala" _tmp127_ = _tmp126_->row; -#line 1243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1244 "/home/jens/Source/shotwell/src/Photo.vala" _tmp128_ = orientation; -#line 1243 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp127_->orientation = _tmp128_; #line 1244 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp127_->orientation = _tmp128_; +#line 1245 "/home/jens/Source/shotwell/src/Photo.vala" _tmp129_ = params; -#line 1244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1245 "/home/jens/Source/shotwell/src/Photo.vala" _tmp130_ = _tmp129_->row; -#line 1244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1245 "/home/jens/Source/shotwell/src/Photo.vala" _tmp131_ = _tmp130_->master; -#line 1244 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1245 "/home/jens/Source/shotwell/src/Photo.vala" _tmp132_ = orientation; -#line 1244 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp131_->original_orientation = _tmp132_; #line 1245 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp131_->original_orientation = _tmp132_; +#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" _tmp133_ = params; -#line 1245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" _tmp134_ = _tmp133_->row; -#line 1245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" _tmp135_ = params; -#line 1245 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" _tmp136_ = _tmp135_->import_id; -#line 1245 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp134_->import_id = _tmp136_; #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp134_->import_id = _tmp136_; +#line 1247 "/home/jens/Source/shotwell/src/Photo.vala" _tmp137_ = params; -#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1247 "/home/jens/Source/shotwell/src/Photo.vala" _tmp138_ = _tmp137_->row; -#line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - event_id_init (&_tmp138_->event_id, EVENT_ID_INVALID); #line 1247 "/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" _tmp139_ = params; -#line 1247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" _tmp140_ = _tmp139_->row; -#line 1247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp140_->transformations); -#line 1247 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp140_->transformations = NULL; #line 1248 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp140_->transformations = NULL; +#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp141_ = params; -#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp142_ = _tmp141_->row; -#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp143_ = detected; -#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp144_ = _tmp143_->md5; -#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp145_ = g_strdup (_tmp144_); -#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp142_->md5); -#line 1248 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp142_->md5 = _tmp145_; #line 1249 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp142_->md5 = _tmp145_; +#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" _tmp146_ = params; -#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" _tmp147_ = _tmp146_->row; -#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" _tmp148_ = detected; -#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" _tmp149_ = _tmp148_->thumbnail_md5; -#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" _tmp150_ = g_strdup (_tmp149_); -#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp147_->thumbnail_md5); -#line 1249 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp147_->thumbnail_md5 = _tmp150_; #line 1250 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp147_->thumbnail_md5 = _tmp150_; +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" _tmp151_ = params; -#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" _tmp152_ = _tmp151_->row; -#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" _tmp153_ = detected; -#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" _tmp154_ = _tmp153_->exif_md5; -#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" _tmp155_ = g_strdup (_tmp154_); -#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp152_->exif_md5); -#line 1250 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp152_->exif_md5 = _tmp155_; #line 1251 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp152_->exif_md5 = _tmp155_; +#line 1252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp156_ = params; -#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp157_ = _tmp156_->row; -#line 1251 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp157_->time_created = (time_t) 0; #line 1252 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp157_->time_created = (time_t) 0; +#line 1253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp158_ = params; -#line 1252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp159_ = _tmp158_->row; -#line 1252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp159_->flags = (guint64) 0; #line 1253 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp159_->flags = (guint64) 0; +#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" _tmp160_ = params; -#line 1253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" _tmp161_ = _tmp160_->row; -#line 1253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" _tmp162_ = _tmp161_->master; -#line 1253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" _tmp163_ = detected; -#line 1253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" _tmp164_ = _tmp163_->file_format; -#line 1253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp162_->file_format = _tmp164_; #line 1254 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp162_->file_format = _tmp164_; +#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp165_ = params; -#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp166_ = _tmp165_->row; -#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp167_ = title; -#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp168_ = g_strdup (_tmp167_); -#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp166_->title); -#line 1254 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp166_->title = _tmp168_; #line 1255 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp166_->title = _tmp168_; +#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" _tmp169_ = params; -#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" _tmp170_ = _tmp169_->row; -#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" _tmp171_ = comment; -#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" _tmp172_ = g_strdup (_tmp171_); -#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp170_->comment); -#line 1255 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp170_->comment = _tmp172_; #line 1256 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp170_->comment = _tmp172_; +#line 1257 "/home/jens/Source/shotwell/src/Photo.vala" _tmp173_ = params; -#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1257 "/home/jens/Source/shotwell/src/Photo.vala" _tmp174_ = _tmp173_->row; -#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1257 "/home/jens/Source/shotwell/src/Photo.vala" _tmp175_ = rating; -#line 1256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1257 "/home/jens/Source/shotwell/src/Photo.vala" _tmp174_->rating = _tmp175_; -#line 1258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" _tmp176_ = params; -#line 1258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" _tmp177_ = _tmp176_->thumbnails; -#line 1258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp177_ != NULL) { -#line 10005 "Photo.c" +#line 10015 "Photo.c" PhotoFileReader* reader = NULL; PhotoImportParams* _tmp178_ = NULL; PhotoRow* _tmp179_ = NULL; @@ -10014,148 +10024,153 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { BackingPhotoRow* _tmp184_ = NULL; const gchar* _tmp185_ = NULL; PhotoFileReader* _tmp186_ = NULL; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" + PhotoFileReader* _tmp187_ = NULL; +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp178_ = params; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp179_ = _tmp178_->row; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp180_ = _tmp179_->master; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp181_ = _tmp180_->file_format; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp182_ = params; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp183_ = _tmp182_->row; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp184_ = _tmp183_->master; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp185_ = _tmp184_->filepath; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp186_ = photo_file_format_create_reader (_tmp181_, _tmp185_); -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" reader = _tmp186_; -#line 10036 "Photo.c" - { - PhotoImportParams* _tmp187_ = NULL; - Thumbnails* _tmp188_ = NULL; - PhotoFileReader* _tmp189_ = NULL; - PhotoImportParams* _tmp190_ = NULL; - PhotoRow* _tmp191_ = NULL; - Orientation _tmp192_ = 0; - PhotoImportParams* _tmp193_ = NULL; - PhotoRow* _tmp194_ = NULL; - BackingPhotoRow* _tmp195_ = NULL; - Dimensions _tmp196_ = {0}; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp187_ = params; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp188_ = _tmp187_->thumbnails; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp189_ = reader; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp190_ = params; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp191_ = _tmp190_->row; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp192_ = _tmp191_->orientation; #line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp193_ = params; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp194_ = _tmp193_->row; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp195_ = _tmp194_->master; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp196_ = _tmp195_->dim; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - thumbnail_cache_generate_for_photo (_tmp188_, _tmp189_, _tmp192_, &_tmp196_, &_inner_error_); + _tmp187_ = reader; #line 1262 "/home/jens/Source/shotwell/src/Photo.vala" + photo_file_reader_set_role (_tmp187_, PHOTO_FILE_READER_ROLE_THUMBNAIL); +#line 10051 "Photo.c" + { + PhotoImportParams* _tmp188_ = NULL; + Thumbnails* _tmp189_ = NULL; + PhotoFileReader* _tmp190_ = NULL; + PhotoImportParams* _tmp191_ = NULL; + PhotoRow* _tmp192_ = NULL; + Orientation _tmp193_ = 0; + PhotoImportParams* _tmp194_ = NULL; + PhotoRow* _tmp195_ = NULL; + BackingPhotoRow* _tmp196_ = NULL; + Dimensions _tmp197_ = {0}; +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp188_ = params; +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp189_ = _tmp188_->thumbnails; +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp190_ = reader; +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp191_ = params; +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp192_ = _tmp191_->row; +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp193_ = _tmp192_->orientation; +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp194_ = params; +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp195_ = _tmp194_->row; +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp196_ = _tmp195_->master; +#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp197_ = _tmp196_->dim; +#line 1264 "/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" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10072 "Photo.c" - goto __catch300_g_error; +#line 10087 "Photo.c" + goto __catch301_g_error; } } - goto __finally300; - __catch300_g_error: + goto __finally301; + __catch301_g_error: { GError* err = NULL; - GError* _tmp197_ = NULL; - ImportResult _tmp198_ = 0; -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" + GError* _tmp198_ = NULL; + ImportResult _tmp199_ = 0; +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp197_ = err; -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp198_ = import_result_convert_error (_tmp197_, IMPORT_RESULT_FILE_ERROR); -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp198_; -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp198_ = err; +#line 1267 "/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" + result = _tmp199_; +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10110 "Photo.c" +#line 10125 "Photo.c" } - __finally300: -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" + __finally301: +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/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 1261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 10135 "Photo.c" +#line 10150 "Photo.c" } -#line 1258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 10139 "Photo.c" +#line 10154 "Photo.c" } -#line 1272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_SUCCESS; -#line 1272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 1272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 1272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10157 "Photo.c" +#line 10172 "Photo.c" } @@ -10220,305 +10235,305 @@ void photo_create_pre_import (PhotoImportParams* params) { PhotoFileSnifferOptions _tmp55_ = 0; PhotoFileInterrogator* _tmp56_ = NULL; GError * _inner_error_ = NULL; -#line 1275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1277 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO_IMPORT_PARAMS (params)); -#line 1276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = params; -#line 1276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_->file; -#line 1276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 1276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp2_; -#line 1277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = params; -#line 1277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->row; -#line 1277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" photo_id_init (&_tmp4_->photo_id, PHOTO_ID_INVALID); -#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = params; -#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->row; -#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->master; -#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_file_get_path (file); -#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp7_->filepath); -#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_->filepath = _tmp8_; -#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = params; -#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->row; -#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_->master; -#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&_tmp11_->dim, 0, 0); -#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = params; -#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_->row; -#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->master; -#line 1280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->filesize = (gint64) 0; -#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = params; -#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_->row; -#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_->master; -#line 1281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_->timestamp = (time_t) 0; -#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = params; -#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->row; -#line 1282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_->exposure_time = (time_t) 0; -#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = params; -#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_->row; -#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_->orientation = ORIENTATION_TOP_LEFT; -#line 1284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = params; -#line 1284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_->row; -#line 1284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_->master; -#line 1284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_->original_orientation = ORIENTATION_TOP_LEFT; -#line 1285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = params; -#line 1285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_->row; -#line 1285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = params; -#line 1285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_->import_id; -#line 1285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_->import_id = _tmp28_; -#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = params; -#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_->row; -#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1288 "/home/jens/Source/shotwell/src/Photo.vala" event_id_init (&_tmp30_->event_id, EVENT_ID_INVALID); -#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = params; -#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_->row; -#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1289 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp32_->transformations); -#line 1287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_->transformations = NULL; -#line 1288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = params; -#line 1288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_->row; -#line 1288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1290 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp34_->md5); -#line 1288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_->md5 = NULL; -#line 1289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = params; -#line 1289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = _tmp35_->row; -#line 1289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1291 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp36_->thumbnail_md5); -#line 1289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_->thumbnail_md5 = NULL; -#line 1290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = params; -#line 1290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp37_->row; -#line 1290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1292 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp38_->exif_md5); -#line 1290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_->exif_md5 = NULL; -#line 1291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = params; -#line 1291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = _tmp39_->row; -#line 1291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_->time_created = (time_t) 0; -#line 1292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = params; -#line 1292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_->row; -#line 1292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_->flags = (guint64) 0; -#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = params; -#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp43_->row; -#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp44_->master; -#line 1293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_->file_format = PHOTO_FILE_FORMAT_JFIF; -#line 1294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = params; -#line 1294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _tmp46_->row; -#line 1294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp47_->title); -#line 1294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_->title = NULL; -#line 1295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = params; -#line 1295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = _tmp48_->row; -#line 1295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp49_->comment); -#line 1295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_->comment = NULL; -#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = params; -#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = _tmp50_->row; -#line 1296 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_->rating = RATING_UNRATED; #line 1298 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp51_->rating = RATING_UNRATED; +#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = params; -#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp52_->file; -#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = params; -#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _tmp54_->sniffer_options; -#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = photo_file_interrogator_new (_tmp53_, _tmp55_); -#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" interrogator = _tmp56_; -#line 10396 "Photo.c" +#line 10411 "Photo.c" { DetectedPhotoInformation* detected = NULL; DetectedPhotoInformation* _tmp57_ = NULL; gboolean _tmp58_ = FALSE; gboolean _tmp59_ = FALSE; DetectedPhotoInformation* _tmp60_ = NULL; -#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (interrogator, &_inner_error_); -#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10407 "Photo.c" - goto __catch301_g_error; +#line 10422 "Photo.c" + goto __catch302_g_error; } -#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = photo_file_interrogator_get_detected_photo_information (interrogator); -#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp57_; -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = detected; -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp60_ != NULL) { -#line 10418 "Photo.c" +#line 10433 "Photo.c" gboolean _tmp61_ = FALSE; -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = photo_file_interrogator_get_is_photo_corrupted (interrogator); -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = !_tmp61_; -#line 10424 "Photo.c" +#line 10439 "Photo.c" } else { -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = FALSE; -#line 10428 "Photo.c" +#line 10443 "Photo.c" } -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp59_) { -#line 10432 "Photo.c" +#line 10447 "Photo.c" DetectedPhotoInformation* _tmp62_ = NULL; PhotoFileFormat _tmp63_ = 0; -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = detected; -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = _tmp62_->file_format; -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = _tmp63_ != PHOTO_FILE_FORMAT_UNKNOWN; -#line 10441 "Photo.c" +#line 10456 "Photo.c" } else { -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = FALSE; -#line 10445 "Photo.c" +#line 10460 "Photo.c" } -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp58_) { -#line 10449 "Photo.c" +#line 10464 "Photo.c" PhotoImportParams* _tmp64_ = NULL; PhotoRow* _tmp65_ = NULL; BackingPhotoRow* _tmp66_ = NULL; DetectedPhotoInformation* _tmp67_ = NULL; PhotoFileFormat _tmp68_ = 0; -#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = params; -#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = _tmp64_->row; -#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = _tmp65_->master; -#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = detected; -#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = _tmp67_->file_format; -#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_->file_format = _tmp68_; -#line 10467 "Photo.c" +#line 10482 "Photo.c" } -#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 10471 "Photo.c" +#line 10486 "Photo.c" } - goto __finally301; - __catch301_g_error: + goto __finally302; + __catch302_g_error: { GError* err = NULL; gchar* _tmp69_ = NULL; gchar* _tmp70_ = NULL; GError* _tmp71_ = NULL; const gchar* _tmp72_ = NULL; -#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = g_file_get_path (file); -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = _tmp69_; -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = err; -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = _tmp71_->message; -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:1305: Unable to interrogate photo file %s: %s", _tmp70_, _tmp72_); -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp70_); -#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 10499 "Photo.c" +#line 10514 "Photo.c" } - __finally301: -#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" + __finally302: +#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1301 "/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 1299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 10514 "Photo.c" +#line 10529 "Photo.c" } -#line 1275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1277 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1277 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 10520 "Photo.c" +#line 10535 "Photo.c" } @@ -10560,51 +10575,51 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF PhotoMetadata* _tmp41_ = NULL; BackingPhotoRow* _tmp45_ = NULL; GError * _inner_error_ = NULL; -#line 1309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1311 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 1309 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (G_IS_FILE (file), NULL); #line 1311 "/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" _detected_photo_information_unref0 (_vala_detected); -#line 1311 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_detected = NULL; #line 1313 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_detected = NULL; +#line 1315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing_photo_row_new (); -#line 1313 "/home/jens/Source/shotwell/src/Photo.vala" - backing = _tmp0_; #line 1315 "/home/jens/Source/shotwell/src/Photo.vala" + backing = _tmp0_; +#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 10576 "Photo.c" +#line 10591 "Photo.c" { GFileInfo* _tmp1_ = NULL; GFile* _tmp2_ = NULL; GFileInfo* _tmp3_ = NULL; GFileInfo* _tmp4_ = NULL; -#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = file; -#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/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 1317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp3_; -#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10590 "Photo.c" - goto __catch302_g_error; +#line 10605 "Photo.c" + goto __catch303_g_error; } -#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp1_; -#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" info = _tmp4_; -#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 10603 "Photo.c" +#line 10618 "Photo.c" } - goto __finally302; - __catch302_g_error: + goto __finally303; + __catch303_g_error: { GError* err = NULL; GFile* _tmp5_ = NULL; @@ -10612,350 +10627,350 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF gchar* _tmp7_ = NULL; GError* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; -#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = file; -#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = g_file_get_path (_tmp5_); -#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = err; -#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_->message; -#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" - g_critical ("Photo.vala:1320: Unable to read file information for %s: %s", _tmp7_, _tmp9_); -#line 1320 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp7_); #line 1322 "/home/jens/Source/shotwell/src/Photo.vala" - result = NULL; + g_critical ("Photo.vala:1322: Unable to read file information for %s: %s", _tmp7_, _tmp9_); #line 1322 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp7_); +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" + result = NULL; +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { -#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 10644 "Photo.c" +#line 10659 "Photo.c" } else { -#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 10648 "Photo.c" +#line 10663 "Photo.c" } -#line 1322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10652 "Photo.c" +#line 10667 "Photo.c" } - __finally302: -#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" + __finally303: +#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1318 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 10665 "Photo.c" +#line 10680 "Photo.c" } -#line 1326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = file; -#line 1326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = options; -#line 1326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_file_interrogator_new (_tmp10_, _tmp11_); -#line 1326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1328 "/home/jens/Source/shotwell/src/Photo.vala" interrogator = _tmp12_; -#line 1327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = interrogator; -#line 1327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (_tmp13_, &_inner_error_); -#line 1327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 10691 "Photo.c" +#line 10706 "Photo.c" } -#line 1328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = interrogator; -#line 1328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_file_interrogator_get_detected_photo_information (_tmp14_); -#line 1328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 1328 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" _vala_detected = _tmp15_; -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _vala_detected; -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_ == NULL) { -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = TRUE; -#line 10707 "Photo.c" +#line 10722 "Photo.c" } else { PhotoFileInterrogator* _tmp18_ = NULL; gboolean _tmp19_ = FALSE; -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = interrogator; -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = photo_file_interrogator_get_is_photo_corrupted (_tmp18_); -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp19_; -#line 10717 "Photo.c" +#line 10732 "Photo.c" } -#line 1329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1331 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_) { -#line 10721 "Photo.c" +#line 10736 "Photo.c" gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; -#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_; -#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" - g_critical ("Photo.vala:1330: Photo update: %s no longer a recognized image", _tmp21_); -#line 1330 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp21_); #line 1332 "/home/jens/Source/shotwell/src/Photo.vala" - result = NULL; + g_critical ("Photo.vala:1332: Photo update: %s no longer a recognized image", _tmp21_); #line 1332 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp21_); +#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" + result = NULL; +#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { -#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 10744 "Photo.c" +#line 10759 "Photo.c" } else { -#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 10748 "Photo.c" +#line 10763 "Photo.c" } -#line 1332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1334 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10752 "Photo.c" +#line 10767 "Photo.c" } -#line 1335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = info; -#line 1335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" g_file_info_get_modification_time (_tmp22_, &_tmp23_); -#line 1335 "/home/jens/Source/shotwell/src/Photo.vala" - modification_time = _tmp23_; #line 1337 "/home/jens/Source/shotwell/src/Photo.vala" + modification_time = _tmp23_; +#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = backing; -#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = file; -#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = g_file_get_path (_tmp25_); -#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp24_->filepath); -#line 1337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_->filepath = _tmp26_; -#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = backing; -#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = modification_time; -#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp28_.tv_sec; -#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_->timestamp = (time_t) _tmp29_; -#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = backing; -#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = info; -#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = g_file_info_get_size (_tmp31_); -#line 1339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_->filesize = _tmp32_; -#line 1340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = backing; -#line 1340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _vala_detected; -#line 1340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_->file_format; -#line 1340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_->file_format = _tmp35_; -#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = backing; -#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _vala_detected; -#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp37_->image_dim; -#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_->dim = _tmp38_; -#line 1342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1344 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = _vala_detected; -#line 1342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1344 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_->metadata; -#line 1342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1344 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_ != NULL) { -#line 10808 "Photo.c" +#line 10823 "Photo.c" DetectedPhotoInformation* _tmp42_ = NULL; PhotoMetadata* _tmp43_ = NULL; Orientation _tmp44_ = 0; -#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _vala_detected; -#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp42_->metadata; -#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = photo_metadata_get_orientation (_tmp43_); -#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp44_; -#line 10820 "Photo.c" +#line 10835 "Photo.c" } else { -#line 1343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = ORIENTATION_TOP_LEFT; -#line 10824 "Photo.c" +#line 10839 "Photo.c" } -#line 1342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1344 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = backing; -#line 1342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1344 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_->original_orientation = _tmp39_; -#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" result = backing; -#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { -#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 10840 "Photo.c" +#line 10855 "Photo.c" } else { -#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 10844 "Photo.c" +#line 10859 "Photo.c" } -#line 1345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10848 "Photo.c" +#line 10863 "Photo.c" } static void _vala_array_add88 (gchar*** array, int* length, int* size, gchar* value) { -#line 1441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10859 "Photo.c" +#line 10874 "Photo.c" } -#line 1441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10865 "Photo.c" +#line 10880 "Photo.c" } static void _vala_array_add89 (gchar*** array, int* length, int* size, gchar* value) { -#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10876 "Photo.c" +#line 10891 "Photo.c" } -#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10882 "Photo.c" +#line 10897 "Photo.c" } static void _vala_array_add90 (gchar*** array, int* length, int* size, gchar* value) { -#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10893 "Photo.c" +#line 10908 "Photo.c" } -#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10899 "Photo.c" +#line 10914 "Photo.c" } static void _vala_array_add91 (gchar*** array, int* length, int* size, gchar* value) { -#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10910 "Photo.c" +#line 10925 "Photo.c" } -#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10916 "Photo.c" +#line 10931 "Photo.c" } static void _vala_array_add92 (gchar*** array, int* length, int* size, gchar* value) { -#line 1457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10927 "Photo.c" +#line 10942 "Photo.c" } -#line 1457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10933 "Photo.c" +#line 10948 "Photo.c" } static void _vala_array_add93 (gchar*** array, int* length, int* size, gchar* value) { -#line 1460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 10944 "Photo.c" +#line 10959 "Photo.c" } -#line 1460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 10950 "Photo.c" +#line 10965 "Photo.c" } static gpointer _media_metadata_ref0 (gpointer self) { -#line 1470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" return self ? media_metadata_ref (self) : NULL; -#line 10957 "Photo.c" +#line 10972 "Photo.c" } @@ -11018,256 +11033,256 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat gint _tmp124__length1 = 0; PhotoReimportMasterStateImpl* _tmp125_ = NULL; GError * _inner_error_ = NULL; -#line 1409 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1411 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 1410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1412 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 1410 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_reimport_state = NULL; #line 1412 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_reimport_state = NULL; +#line 1414 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_master_reader (self); -#line 1412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1414 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1414 "/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 1412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1414 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1414 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp1_); -#line 1412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1414 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp3_; -#line 1415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = file; -#line 1415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1417 "/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 1415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp5_; -#line 1415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp6_; -#line 1415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 11058 "Photo.c" +#line 11073 "Photo.c" } -#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = backing; -#line 1417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_ == NULL) { -#line 11064 "Photo.c" +#line 11079 "Photo.c" GFile* _tmp8_ = NULL; gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; -#line 1418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = file; -#line 1418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = g_file_get_path (_tmp8_); -#line 1418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_; -#line 1418 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1418: Unable to retrieve photo state from %s for reimport", _tmp10_); -#line 1418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:1420: Unable to retrieve photo state from %s for reimport", _tmp10_); +#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp10_); -#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" if (reimport_state) { -#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11090 "Photo.c" +#line 11105 "Photo.c" } else { -#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11094 "Photo.c" +#line 11109 "Photo.c" } -#line 1419 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1421 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11098 "Photo.c" +#line 11113 "Photo.c" } -#line 1423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = detected; -#line 1423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->colorspace; -#line 1423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != GDK_COLORSPACE_RGB) { -#line 1423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = TRUE; -#line 11108 "Photo.c" +#line 11123 "Photo.c" } else { DetectedPhotoInformation* _tmp15_ = NULL; gint _tmp16_ = 0; -#line 1424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1426 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = detected; -#line 1424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1426 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_->channels; -#line 1424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1426 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp16_ < 3; -#line 11118 "Photo.c" +#line 11133 "Photo.c" } -#line 1423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 1423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; -#line 11124 "Photo.c" +#line 11139 "Photo.c" } else { DetectedPhotoInformation* _tmp17_ = NULL; gint _tmp18_ = 0; -#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1427 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = detected; -#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1427 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_->bits_per_channel; -#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1427 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp18_ != 8; -#line 11134 "Photo.c" +#line 11149 "Photo.c" } -#line 1423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1425 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 11138 "Photo.c" +#line 11153 "Photo.c" GFile* _tmp19_ = NULL; gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; -#line 1426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = file; -#line 1426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = g_file_get_path (_tmp19_); -#line 1426 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_; -#line 1426 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1426: Not re-importing %s: Unsupported color format", _tmp21_); -#line 1426 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp21_); #line 1428 "/home/jens/Source/shotwell/src/Photo.vala" - result = FALSE; + g_warning ("Photo.vala:1428: Not re-importing %s: Unsupported color format", _tmp21_); #line 1428 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp21_); +#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" + result = FALSE; +#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" if (reimport_state) { -#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11164 "Photo.c" +#line 11179 "Photo.c" } else { -#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11168 "Photo.c" +#line 11183 "Photo.c" } -#line 1428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1430 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11172 "Photo.c" +#line 11187 "Photo.c" } -#line 1432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1434 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = photo_row_new (); -#line 1432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1434 "/home/jens/Source/shotwell/src/Photo.vala" updated_row = _tmp22_; -#line 11178 "Photo.c" +#line 11193 "Photo.c" { PhotoRow* _tmp23_ = NULL; -#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = self->row; -#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 11185 "Photo.c" +#line 11200 "Photo.c" { PhotoRow* _tmp24_ = NULL; PhotoRow* _tmp25_ = NULL; -#line 1434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = self->row; -#line 1434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _photo_row_ref0 (_tmp24_); -#line 1434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (updated_row); -#line 1434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1436 "/home/jens/Source/shotwell/src/Photo.vala" updated_row = _tmp25_; -#line 11197 "Photo.c" +#line 11212 "Photo.c" } - __finally303: + __finally304: { PhotoRow* _tmp26_ = NULL; -#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = self->row; -#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 11206 "Photo.c" +#line 11221 "Photo.c" } -#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (updated_row); -#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1435 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 11222 "Photo.c" +#line 11237 "Photo.c" } } -#line 1438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = g_new0 (gchar*, 0 + 1); -#line 1438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" list = _tmp27_; -#line 1438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" list_length1 = 0; -#line 1438 "/home/jens/Source/shotwell/src/Photo.vala" - _list_size_ = list_length1; #line 1440 "/home/jens/Source/shotwell/src/Photo.vala" + _list_size_ = list_length1; +#line 1442 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = updated_row; -#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1442 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp28_->md5; -#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1442 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = detected; -#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1442 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_->md5; -#line 1440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1442 "/home/jens/Source/shotwell/src/Photo.vala" if (g_strcmp0 (_tmp29_, _tmp31_) != 0) { -#line 11243 "Photo.c" +#line 11258 "Photo.c" gchar** _tmp32_ = NULL; gint _tmp32__length1 = 0; gchar* _tmp33_ = NULL; -#line 1441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = list; -#line 1441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32__length1 = list_length1; -#line 1441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = g_strdup ("metadata:md5"); -#line 1441 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add88 (&list, &list_length1, &_list_size_, _tmp33_); -#line 11255 "Photo.c" +#line 11270 "Photo.c" } -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = updated_row; -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_->master; -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = _tmp35_->original_orientation; -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = backing; -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp37_->original_orientation; -#line 1443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp36_ != _tmp38_) { -#line 11269 "Photo.c" +#line 11284 "Photo.c" gchar** _tmp39_ = NULL; gint _tmp39__length1 = 0; gchar* _tmp40_ = NULL; @@ -11275,33 +11290,33 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat BackingPhotoRow* _tmp42_ = NULL; BackingPhotoRow* _tmp43_ = NULL; Orientation _tmp44_ = 0; -#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = list; -#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39__length1 = list_length1; -#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = g_strdup ("image:orientation"); -#line 1444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1446 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add89 (&list, &list_length1, &_list_size_, _tmp40_); -#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = updated_row; -#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_->master; -#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = backing; -#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp43_->original_orientation; -#line 1445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1447 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_->original_orientation = _tmp44_; -#line 11295 "Photo.c" +#line 11310 "Photo.c" } -#line 1448 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = detected; -#line 1448 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = _tmp45_->metadata; -#line 1448 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp46_ != NULL) { -#line 11303 "Photo.c" +#line 11318 "Photo.c" MetadataDateTime* date_time = NULL; DetectedPhotoInformation* _tmp47_ = NULL; PhotoMetadata* _tmp48_ = NULL; @@ -11327,204 +11342,204 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat DetectedPhotoInformation* _tmp78_ = NULL; PhotoMetadata* _tmp79_ = NULL; Rating _tmp80_ = 0; -#line 1449 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = detected; -#line 1449 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_->metadata; -#line 1449 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = photo_metadata_get_exposure_date_time (_tmp48_); -#line 1449 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" date_time = _tmp49_; -#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = date_time; -#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp51_ != NULL) { -#line 11341 "Photo.c" +#line 11356 "Photo.c" PhotoRow* _tmp52_ = NULL; time_t _tmp53_ = 0; MetadataDateTime* _tmp54_ = NULL; time_t _tmp55_ = 0; -#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = updated_row; -#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp52_->exposure_time; -#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = date_time; -#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = metadata_date_time_get_timestamp (_tmp54_); -#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = _tmp53_ != _tmp55_; -#line 11356 "Photo.c" +#line 11371 "Photo.c" } else { -#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = FALSE; -#line 11360 "Photo.c" +#line 11375 "Photo.c" } -#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1452 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp50_) { -#line 11364 "Photo.c" +#line 11379 "Photo.c" gchar** _tmp56_ = NULL; gint _tmp56__length1 = 0; gchar* _tmp57_ = NULL; -#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = list; -#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56__length1 = list_length1; -#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = g_strdup ("metadata:exposure-time"); -#line 1451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add90 (&list, &list_length1, &_list_size_, _tmp57_); -#line 11376 "Photo.c" +#line 11391 "Photo.c" } -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = updated_row; -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = _tmp58_->title; -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = detected; -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _tmp60_->metadata; -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = _tmp62_; -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = g_strcmp0 (_tmp59_, _tmp63_) != 0; -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp63_); -#line 1453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1455 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp64_) { -#line 11396 "Photo.c" +#line 11411 "Photo.c" gchar** _tmp65_ = NULL; gint _tmp65__length1 = 0; gchar* _tmp66_ = NULL; -#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = list; -#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65__length1 = list_length1; -#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = g_strdup ("metadata:name"); -#line 1454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add91 (&list, &list_length1, &_list_size_, _tmp66_); -#line 11408 "Photo.c" +#line 11423 "Photo.c" } -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = updated_row; -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = _tmp67_->comment; -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = detected; -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = _tmp69_->metadata; -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = _tmp71_; -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = g_strcmp0 (_tmp68_, _tmp72_) != 0; -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp72_); -#line 1456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1458 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp73_) { -#line 11428 "Photo.c" +#line 11443 "Photo.c" gchar** _tmp74_ = NULL; gint _tmp74__length1 = 0; gchar* _tmp75_ = NULL; -#line 1457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = list; -#line 1457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74__length1 = list_length1; -#line 1457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = g_strdup ("metadata:comment"); -#line 1457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add92 (&list, &list_length1, &_list_size_, _tmp75_); -#line 11440 "Photo.c" +#line 11455 "Photo.c" } -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = updated_row; -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = _tmp76_->rating; -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = detected; -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = _tmp78_->metadata; -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = photo_metadata_get_rating (_tmp79_); -#line 1459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1461 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp77_ != _tmp80_) { -#line 11454 "Photo.c" +#line 11469 "Photo.c" gchar** _tmp81_ = NULL; gint _tmp81__length1 = 0; gchar* _tmp82_ = NULL; -#line 1460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = list; -#line 1460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81__length1 = list_length1; -#line 1460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = g_strdup ("metadata:rating"); -#line 1460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1462 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add93 (&list, &list_length1, &_list_size_, _tmp82_); -#line 11466 "Photo.c" +#line 11481 "Photo.c" } -#line 1448 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1450 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 11470 "Photo.c" +#line 11485 "Photo.c" } -#line 1463 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = updated_row; -#line 1463 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = backing; -#line 1463 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = _backing_photo_row_ref0 (_tmp84_); -#line 1463 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp83_->master); -#line 1463 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_->master = _tmp85_; -#line 1464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = updated_row; -#line 1464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = detected; -#line 1464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = _tmp87_->md5; -#line 1464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = g_strdup (_tmp88_); -#line 1464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp86_->md5); -#line 1464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_->md5 = _tmp89_; -#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = updated_row; -#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = detected; -#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = _tmp91_->exif_md5; -#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = g_strdup (_tmp92_); -#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1467 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp90_->exif_md5); -#line 1465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_->exif_md5 = _tmp93_; -#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = updated_row; -#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = detected; -#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = _tmp95_->thumbnail_md5; -#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = g_strdup (_tmp96_); -#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1468 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp94_->thumbnail_md5); -#line 1466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_->thumbnail_md5 = _tmp97_; #line 1468 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp94_->thumbnail_md5 = _tmp97_; +#line 1470 "/home/jens/Source/shotwell/src/Photo.vala" metadata = NULL; -#line 1469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = detected; -#line 1469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = _tmp98_->metadata; -#line 1469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp99_ != NULL) { -#line 11526 "Photo.c" +#line 11541 "Photo.c" DetectedPhotoInformation* _tmp100_ = NULL; PhotoMetadata* _tmp101_ = NULL; PhotoMetadata* _tmp102_ = NULL; @@ -11545,180 +11560,180 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat DetectedPhotoInformation* _tmp119_ = NULL; PhotoMetadata* _tmp120_ = NULL; Rating _tmp121_ = 0; -#line 1470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = detected; -#line 1470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = _tmp100_->metadata; -#line 1470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = _media_metadata_ref0 (_tmp101_); -#line 1470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 1470 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp102_; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" + metadata = _tmp102_; +#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = detected; -#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = _tmp103_->metadata; -#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp105_ = photo_metadata_get_exposure_date_time (_tmp104_); -#line 1472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" date_time = _tmp105_; -#line 1473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = date_time; -#line 1473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1475 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp106_ != NULL) { -#line 11569 "Photo.c" +#line 11584 "Photo.c" PhotoRow* _tmp107_ = NULL; MetadataDateTime* _tmp108_ = NULL; time_t _tmp109_ = 0; -#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" _tmp107_ = updated_row; -#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = date_time; -#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" _tmp109_ = metadata_date_time_get_timestamp (_tmp108_); -#line 1474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" _tmp107_->exposure_time = _tmp109_; -#line 11581 "Photo.c" +#line 11596 "Photo.c" } -#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110_ = updated_row; -#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" _tmp111_ = detected; -#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" _tmp112_ = _tmp111_->metadata; -#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp110_->title); -#line 1476 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110_->title = _tmp113_; -#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_ = updated_row; -#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp115_ = detected; -#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp116_ = _tmp115_->metadata; -#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp117_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1479 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp114_->comment); -#line 1477 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_->comment = _tmp117_; -#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp118_ = updated_row; -#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp119_ = detected; -#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp120_ = _tmp119_->metadata; -#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = photo_metadata_get_rating (_tmp120_); -#line 1478 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" _tmp118_->rating = _tmp121_; -#line 1469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 11619 "Photo.c" +#line 11634 "Photo.c" } -#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp122_ = updated_row; -#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = metadata; -#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124_ = list; -#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124__length1 = list_length1; -#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp125_ = photo_reimport_master_state_impl_new (_tmp122_, _tmp123_, _tmp124_, _tmp124__length1); -#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 1481 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); #line 1483 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" list = (_vala_array_free (list, list_length1, (GDestroyNotify) g_free), NULL); -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (updated_row); -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" if (reimport_state) { -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11653 "Photo.c" +#line 11668 "Photo.c" } else { -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11657 "Photo.c" +#line 11672 "Photo.c" } -#line 1483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1485 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11661 "Photo.c" +#line 11676 "Photo.c" } static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) { -#line 1486 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1488 "/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 1486 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1488 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11670 "Photo.c" +#line 11685 "Photo.c" } void photo_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) { -#line 1486 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1488 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1486 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1488 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->apply_user_metadata_for_reimport (self, metadata); -#line 11679 "Photo.c" +#line 11694 "Photo.c" } static gpointer _photo_reimport_master_state_ref0 (gpointer self) { -#line 1490 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_master_state_ref (self) : NULL; -#line 11686 "Photo.c" +#line 11701 "Photo.c" } static void _vala_array_add94 (gchar*** array, int* length, int* size, gchar* value) { -#line 1508 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1508 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1508 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11697 "Photo.c" +#line 11712 "Photo.c" } -#line 1508 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1508 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11703 "Photo.c" +#line 11718 "Photo.c" } static void _vala_array_add95 (gchar*** array, int* length, int* size, gchar* value) { -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11714 "Photo.c" +#line 11729 "Photo.c" } -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11720 "Photo.c" +#line 11735 "Photo.c" } @@ -11737,56 +11752,56 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, gboolean _tmp33_ = FALSE; gboolean _tmp35_ = FALSE; GError * _inner_error_ = NULL; -#line 1489 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1491 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1489 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1491 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state)); -#line 1490 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = state; -#line 1490 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1492 "/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 1490 "/home/jens/Source/shotwell/src/Photo.vala" - reimport_state = _tmp1_; #line 1492 "/home/jens/Source/shotwell/src/Photo.vala" + reimport_state = _tmp1_; +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_table_get_instance (); -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = reimport_state->row; -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_reimport (_tmp3_, _tmp4_, &_inner_error_); -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp3_); -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11769 "Photo.c" +#line 11784 "Photo.c" } else { -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/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 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11779 "Photo.c" +#line 11794 "Photo.c" } } { PhotoRow* _tmp5_ = NULL; -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 11788 "Photo.c" +#line 11803 "Photo.c" { BackingPhotoRow* original_master = NULL; PhotoRow* _tmp6_ = NULL; @@ -11802,191 +11817,191 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, PhotoRow* _tmp16_ = NULL; BackingPhotoRow* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->master; -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _backing_photo_row_ref0 (_tmp7_); -#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" original_master = _tmp8_; -#line 1497 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = reimport_state->row; -#line 1497 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _photo_row_ref0 (_tmp9_); -#line 1497 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (self->row); -#line 1497 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" self->row = _tmp10_; -#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1500 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1500 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = original_master; -#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1500 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _backing_photo_row_ref0 (_tmp12_); -#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1500 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp11_->master); -#line 1498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1500 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_->master = _tmp13_; -#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1501 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1501 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->master; -#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1501 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = reimport_state->row; -#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1501 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_->master; -#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1501 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_row_copy_from (_tmp15_, _tmp17_); -#line 1500 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = reimport_state->metadata_only; -#line 1500 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1502 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp18_) { -#line 1501 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1503 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 11846 "Photo.c" +#line 11861 "Photo.c" } -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (original_master); -#line 11850 "Photo.c" +#line 11865 "Photo.c" } - __finally304: + __finally305: { PhotoRow* _tmp19_ = NULL; -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 11859 "Photo.c" +#line 11874 "Photo.c" } -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11871 "Photo.c" +#line 11886 "Photo.c" } else { -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1496 "/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 1496 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1496 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11881 "Photo.c" +#line 11896 "Photo.c" } } } -#line 1504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1506 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = reimport_state->metadata; -#line 1504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1506 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp20_ != NULL) { -#line 11889 "Photo.c" +#line 11904 "Photo.c" PhotoMetadata* _tmp21_ = NULL; -#line 1505 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1507 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = reimport_state->metadata; -#line 1505 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1507 "/home/jens/Source/shotwell/src/Photo.vala" photo_apply_user_metadata_for_reimport (self, _tmp21_); -#line 11895 "Photo.c" +#line 11910 "Photo.c" } -#line 1507 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1509 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = reimport_state->metadata_only; -#line 1507 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1509 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp22_) { -#line 11901 "Photo.c" +#line 11916 "Photo.c" gchar** _tmp23_ = NULL; gint _tmp23__length1 = 0; gchar* _tmp24_ = NULL; gboolean _tmp25_ = FALSE; -#line 1508 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = reimport_state->alterations; -#line 1508 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23__length1 = reimport_state->alterations_length1; -#line 1508 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = g_strdup ("image:master"); -#line 1508 "/home/jens/Source/shotwell/src/Photo.vala" +#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 1509 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1511 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = photo_is_master_baseline (self); -#line 1509 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1511 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp25_) { -#line 11918 "Photo.c" +#line 11933 "Photo.c" gchar** _tmp26_ = NULL; gint _tmp26__length1 = 0; gchar* _tmp27_ = NULL; -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = reimport_state->alterations; -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26__length1 = reimport_state->alterations_length1; -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1512 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = g_strdup ("image:baseline"); -#line 1510 "/home/jens/Source/shotwell/src/Photo.vala" +#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 11930 "Photo.c" +#line 11945 "Photo.c" } } -#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = reimport_state->alterations; -#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28__length1 = reimport_state->alterations_length1; -#line 1513 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1515 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28__length1 > 0) { -#line 11939 "Photo.c" +#line 11954 "Photo.c" gchar** _tmp29_ = NULL; gint _tmp29__length1 = 0; Alteration* _tmp30_ = NULL; Alteration* _tmp31_ = NULL; -#line 1514 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = reimport_state->alterations; -#line 1514 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29__length1 = reimport_state->alterations_length1; -#line 1514 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = alteration_new_from_array (_tmp29_, _tmp29__length1); -#line 1514 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_; -#line 1514 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp31_); -#line 1514 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp31_); -#line 11956 "Photo.c" +#line 11971 "Photo.c" } -#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1518 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = reimport_state->metadata; -#line 1516 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_master_reimported (self, _tmp32_); #line 1518 "/home/jens/Source/shotwell/src/Photo.vala" + photo_notify_master_reimported (self, _tmp32_); +#line 1520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = photo_is_master_baseline (self); -#line 1518 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1520 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp33_) { -#line 11966 "Photo.c" +#line 11981 "Photo.c" PhotoMetadata* _tmp34_ = NULL; -#line 1519 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1521 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = reimport_state->metadata; -#line 1519 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1521 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_reimported (self, _tmp34_); -#line 11972 "Photo.c" +#line 11987 "Photo.c" } -#line 1521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1523 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_is_master_source (self); -#line 1521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1523 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp35_) { -#line 11978 "Photo.c" +#line 11993 "Photo.c" PhotoMetadata* _tmp36_ = NULL; -#line 1522 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1524 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = reimport_state->metadata; -#line 1522 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1524 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_source_reimported (self, _tmp36_); -#line 11984 "Photo.c" +#line 11999 "Photo.c" } -#line 1489 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1491 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 11988 "Photo.c" +#line 12003 "Photo.c" } @@ -12005,175 +12020,175 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin DetectedPhotoInformation* _tmp8_ = NULL; GdkColorspace _tmp9_ = 0; GError * _inner_error_ = NULL; -#line 1526 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 1526 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 1528 "/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" _tmp1_ = file; -#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1530 "/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 1528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" _vala_detected = _tmp2_; -#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 12027 "Photo.c" +#line 12042 "Photo.c" } -#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp0_; -#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 1528 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_backing = _tmp4_; #line 1530 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_backing = _tmp4_; +#line 1532 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _vala_backing; -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1532 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ == NULL) { -#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp0_); -#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" if (backing) { -#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12049 "Photo.c" +#line 12064 "Photo.c" } else { -#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12053 "Photo.c" +#line 12068 "Photo.c" } -#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { -#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12059 "Photo.c" +#line 12074 "Photo.c" } else { -#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12063 "Photo.c" +#line 12078 "Photo.c" } -#line 1531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1533 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12067 "Photo.c" +#line 12082 "Photo.c" } -#line 1535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _vala_detected; -#line 1535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_->colorspace; -#line 1535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp9_ != GDK_COLORSPACE_RGB) { -#line 1535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = TRUE; -#line 12077 "Photo.c" +#line 12092 "Photo.c" } else { DetectedPhotoInformation* _tmp10_ = NULL; gint _tmp11_ = 0; -#line 1536 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1538 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _vala_detected; -#line 1536 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1538 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_->channels; -#line 1536 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1538 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp11_ < 3; -#line 12087 "Photo.c" +#line 12102 "Photo.c" } -#line 1535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { -#line 1535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = TRUE; -#line 12093 "Photo.c" +#line 12108 "Photo.c" } else { DetectedPhotoInformation* _tmp12_ = NULL; gint _tmp13_ = 0; -#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1539 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _vala_detected; -#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1539 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_->bits_per_channel; -#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1539 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp13_ != 8; -#line 12103 "Photo.c" +#line 12118 "Photo.c" } -#line 1535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1537 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 12107 "Photo.c" +#line 12122 "Photo.c" GFile* _tmp14_ = NULL; gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; -#line 1538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = file; -#line 1538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = g_file_get_path (_tmp14_); -#line 1538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 1538 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1538: Not re-importing %s: Unsupported color format", _tmp16_); -#line 1538 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp16_); #line 1540 "/home/jens/Source/shotwell/src/Photo.vala" - result = FALSE; + g_warning ("Photo.vala:1540: Not re-importing %s: Unsupported color format", _tmp16_); #line 1540 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp16_); +#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" + result = FALSE; +#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp0_); -#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" if (backing) { -#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12129 "Photo.c" +#line 12144 "Photo.c" } else { -#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12133 "Photo.c" +#line 12148 "Photo.c" } -#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { -#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12139 "Photo.c" +#line 12154 "Photo.c" } else { -#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12143 "Photo.c" +#line 12158 "Photo.c" } -#line 1540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12147 "Photo.c" +#line 12162 "Photo.c" } -#line 1543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 1543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp0_); -#line 1543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" if (backing) { -#line 1543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12157 "Photo.c" +#line 12172 "Photo.c" } else { -#line 1543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12161 "Photo.c" +#line 12176 "Photo.c" } -#line 1543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { -#line 1543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12167 "Photo.c" +#line 12182 "Photo.c" } else { -#line 1543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12171 "Photo.c" +#line 12186 "Photo.c" } -#line 1543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1545 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12175 "Photo.c" +#line 12190 "Photo.c" } @@ -12195,130 +12210,130 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable PhotoMetadata* _tmp9_ = NULL; PhotoReimportEditableStateImpl* _tmp10_ = NULL; GError * _inner_error_ = NULL; -#line 1547 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 1548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1550 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 1548 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = NULL; #line 1550 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_state = NULL; +#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_editable_file (self); -#line 1550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp0_; -#line 1551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file; -#line 1551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1553 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1554 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1554 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1554 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1554 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12219 "Photo.c" +#line 12234 "Photo.c" } else { -#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1554 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12223 "Photo.c" +#line 12238 "Photo.c" } -#line 1552 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1554 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12227 "Photo.c" +#line 12242 "Photo.c" } -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_verify_file_for_reimport (self, _tmp3_, &_tmp4_, &_tmp5_, &_inner_error_); -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp4_; -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp5_; -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp6_; -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 12255 "Photo.c" +#line 12270 "Photo.c" } -#line 1556 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1558 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp2_) { -#line 1557 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1557 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1557 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1557 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1557 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 1557 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12271 "Photo.c" +#line 12286 "Photo.c" } else { -#line 1557 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12275 "Photo.c" +#line 12290 "Photo.c" } -#line 1557 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12279 "Photo.c" +#line 12294 "Photo.c" } -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = backing; -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = detected; -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_->metadata; -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_reimport_editable_state_impl_new (_tmp7_, _tmp9_); -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState); #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState); +#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12305 "Photo.c" +#line 12320 "Photo.c" } else { -#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12309 "Photo.c" +#line 12324 "Photo.c" } -#line 1561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1563 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12313 "Photo.c" +#line 12328 "Photo.c" } static gpointer _photo_reimport_editable_state_ref0 (gpointer self) { -#line 1570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1572 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_editable_state_ref (self) : NULL; -#line 12320 "Photo.c" +#line 12335 "Photo.c" } @@ -12345,81 +12360,81 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st gboolean _tmp46_ = FALSE; gboolean _tmp49_ = FALSE; GError * _inner_error_ = NULL; -#line 1565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1567 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1567 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_EDITABLE_STATE (state)); -#line 1566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1568 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_editable_id (self, &_tmp0_); -#line 1566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1568 "/home/jens/Source/shotwell/src/Photo.vala" editable_id = _tmp0_; -#line 1567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = backing_photo_id_is_invalid (&editable_id); -#line 1567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1569 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 1568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1570 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12361 "Photo.c" +#line 12376 "Photo.c" } -#line 1570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = state; -#line 1570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1572 "/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 1570 "/home/jens/Source/shotwell/src/Photo.vala" - reimport_state = _tmp3_; #line 1572 "/home/jens/Source/shotwell/src/Photo.vala" + reimport_state = _tmp3_; +#line 1574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = reimport_state; -#line 1572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->metadata_only; -#line 1572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1574 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp5_) { -#line 12375 "Photo.c" +#line 12390 "Photo.c" BackingPhotoTable* _tmp6_ = NULL; BackingPhotoTable* _tmp7_ = NULL; PhotoReimportEditableStateImpl* _tmp8_ = NULL; BackingPhotoRow* _tmp9_ = NULL; -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = backing_photo_table_get_instance (); -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = reimport_state; -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_->backing_state; -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_update (_tmp7_, _tmp9_, &_inner_error_); -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp7_); -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12402 "Photo.c" +#line 12417 "Photo.c" } else { -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/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 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12412 "Photo.c" +#line 12427 "Photo.c" } } { PhotoRow* _tmp10_ = NULL; -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->row; -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 12421 "Photo.c" +#line 12436 "Photo.c" { PhotoReimportEditableStateImpl* _tmp11_ = NULL; BackingPhotoRow* _tmp12_ = NULL; @@ -12427,58 +12442,58 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st PhotoReimportEditableStateImpl* _tmp14_ = NULL; BackingPhotoRow* _tmp15_ = NULL; Orientation _tmp16_ = 0; -#line 1576 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = reimport_state; -#line 1576 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->backing_state; -#line 1576 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _backing_photo_row_ref0 (_tmp12_); -#line 1576 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); -#line 1576 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->editable = _tmp13_; -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1579 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = reimport_state; -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1579 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->backing_state; -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1579 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_->original_orientation; -#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1579 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp16_); -#line 1578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1580 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 12449 "Photo.c" +#line 12464 "Photo.c" } - __finally305: + __finally306: { PhotoRow* _tmp17_ = NULL; -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->row; -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 12458 "Photo.c" +#line 12473 "Photo.c" } -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12470 "Photo.c" +#line 12485 "Photo.c" } else { -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/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 1577 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1577 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12480 "Photo.c" +#line 12495 "Photo.c" } } } @@ -12486,23 +12501,23 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st PhotoReimportEditableStateImpl* _tmp18_ = NULL; BackingPhotoRow* _tmp19_ = NULL; Orientation _tmp20_ = 0; -#line 1581 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1583 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = reimport_state; -#line 1581 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1583 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->backing_state; -#line 1581 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1583 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_->original_orientation; -#line 1581 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1583 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp20_); -#line 12496 "Photo.c" +#line 12511 "Photo.c" } -#line 1584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = reimport_state; -#line 1584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_->metadata; -#line 1584 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_ != NULL) { -#line 12504 "Photo.c" +#line 12519 "Photo.c" PhotoReimportEditableStateImpl* _tmp23_ = NULL; PhotoMetadata* _tmp24_ = NULL; gchar* _tmp25_ = NULL; @@ -12516,127 +12531,127 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st Rating _tmp33_ = 0; PhotoReimportEditableStateImpl* _tmp34_ = NULL; PhotoMetadata* _tmp35_ = NULL; -#line 1585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = reimport_state; -#line 1585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_->metadata; -#line 1585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_; -#line 1585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp26_); -#line 1585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp26_); -#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = reimport_state; -#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_->metadata; -#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_; -#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp30_); -#line 1586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp30_); -#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1589 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = reimport_state; -#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1589 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_->metadata; -#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1589 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = photo_metadata_get_rating (_tmp32_); -#line 1587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1589 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp33_); -#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = reimport_state; -#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_->metadata; -#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1590 "/home/jens/Source/shotwell/src/Photo.vala" photo_apply_user_metadata_for_reimport (self, _tmp35_); -#line 12556 "Photo.c" +#line 12571 "Photo.c" } -#line 1591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); -#line 1591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1593 "/home/jens/Source/shotwell/src/Photo.vala" list = _tmp36_; -#line 1592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = reimport_state; -#line 1592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp37_->metadata_only; -#line 1592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1594 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp38_) { -#line 12568 "Photo.c" +#line 12583 "Photo.c" const gchar* _tmp39_ = NULL; gchar* _tmp40_ = NULL; -#line 1593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1595 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = list; -#line 1593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1595 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = g_strconcat (_tmp39_, "image:editable,image:baseline", NULL); -#line 1593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1595 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); -#line 1593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1595 "/home/jens/Source/shotwell/src/Photo.vala" list = _tmp40_; -#line 12579 "Photo.c" +#line 12594 "Photo.c" } -#line 1595 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = list; -#line 1595 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = alteration_new_from_list (_tmp41_); -#line 1595 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp42_; -#line 1595 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp43_); -#line 1595 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp43_); #line 1597 "/home/jens/Source/shotwell/src/Photo.vala" + _alteration_unref0 (_tmp43_); +#line 1599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = reimport_state; -#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp44_->metadata; -#line 1597 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_editable_reimported (self, _tmp45_); #line 1599 "/home/jens/Source/shotwell/src/Photo.vala" + photo_notify_editable_reimported (self, _tmp45_); +#line 1601 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = photo_is_editable_baseline (self); -#line 1599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1601 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp46_) { -#line 12601 "Photo.c" +#line 12616 "Photo.c" PhotoReimportEditableStateImpl* _tmp47_ = NULL; PhotoMetadata* _tmp48_ = NULL; -#line 1600 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1602 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = reimport_state; -#line 1600 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1602 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_->metadata; -#line 1600 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1602 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_reimported (self, _tmp48_); -#line 12610 "Photo.c" +#line 12625 "Photo.c" } -#line 1602 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1604 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = photo_is_editable_source (self); -#line 1602 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1604 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_) { -#line 12616 "Photo.c" +#line 12631 "Photo.c" PhotoReimportEditableStateImpl* _tmp50_ = NULL; PhotoMetadata* _tmp51_ = NULL; -#line 1603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = reimport_state; -#line 1603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = _tmp50_->metadata; -#line 1603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1605 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_source_reimported (self, _tmp51_); -#line 12625 "Photo.c" +#line 12640 "Photo.c" } -#line 1565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1567 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); -#line 1565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1567 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); -#line 12631 "Photo.c" +#line 12646 "Photo.c" } static gpointer _photo_reimport_raw_development_state_ref0 (gpointer self) { -#line 1625 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1627 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_raw_development_state_ref (self) : NULL; -#line 12638 "Photo.c" +#line 12653 "Photo.c" } @@ -12653,56 +12668,56 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR PhotoReimportRawDevelopmentStateImpl* _tmp20_ = NULL; gint _tmp21_ = 0; GError * _inner_error_ = NULL; -#line 1607 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1609 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 1608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1610 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 1608 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = NULL; #line 1610 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_state = NULL; +#line 1612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_raw_developer_files (self); -#line 1610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1612 "/home/jens/Source/shotwell/src/Photo.vala" files = _tmp0_; -#line 1611 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1613 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = files; -#line 1611 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1613 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 1612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (files); -#line 1612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 1612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12677 "Photo.c" +#line 12692 "Photo.c" } else { -#line 1612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 12681 "Photo.c" +#line 12696 "Photo.c" } -#line 1612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12685 "Photo.c" +#line 12700 "Photo.c" } -#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_reimport_raw_development_state_impl_new (); -#line 1614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" reimport_state = _tmp2_; -#line 12691 "Photo.c" +#line 12706 "Photo.c" { GeeIterator* _file_it = NULL; GeeCollection* _tmp3_ = NULL; GeeIterator* _tmp4_ = NULL; -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = files; -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _file_it = _tmp4_; -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 12704 "Photo.c" +#line 12719 "Photo.c" GeeIterator* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; GFile* file = NULL; @@ -12719,121 +12734,121 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR BackingPhotoRow* _tmp15_ = NULL; DetectedPhotoInformation* _tmp16_ = NULL; PhotoMetadata* _tmp17_ = NULL; -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _file_it; -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_iterator_next (_tmp5_); -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp6_) { -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 12729 "Photo.c" +#line 12744 "Photo.c" } -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _file_it; -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = gee_iterator_get (_tmp7_); -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" file = (GFile*) _tmp8_; -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = file; -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_verify_file_for_reimport (self, _tmp10_, &_tmp11_, &_tmp12_, &_inner_error_); -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp11_; -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp12_; -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp13_; -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_file_it); -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (files); -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 12769 "Photo.c" +#line 12784 "Photo.c" } -#line 1619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1621 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp9_) { -#line 1620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1622 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1622 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1622 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 1620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1622 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 12781 "Photo.c" +#line 12796 "Photo.c" } -#line 1622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = reimport_state; -#line 1622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = backing; -#line 1622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = detected; -#line 1622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_->metadata; -#line 1622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1624 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_add (_tmp14_, _tmp15_, _tmp17_); -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 12799 "Photo.c" +#line 12814 "Photo.c" } -#line 1616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1618 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_file_it); -#line 12803 "Photo.c" +#line 12818 "Photo.c" } -#line 1625 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1627 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = reimport_state; -#line 1625 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1627 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState)); -#line 1625 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1627 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 1625 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1627 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = _tmp19_; -#line 1626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = reimport_state; -#line 1626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_reimport_raw_development_state_impl_get_size (_tmp20_); -#line 1626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp21_ > 0; -#line 1626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); -#line 1626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (files); -#line 1626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 1626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12827 "Photo.c" +#line 12842 "Photo.c" } else { -#line 1626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 12831 "Photo.c" +#line 12846 "Photo.c" } -#line 1626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1628 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12835 "Photo.c" +#line 12850 "Photo.c" } @@ -12850,41 +12865,41 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop Alteration* _tmp38_ = NULL; Alteration* _tmp39_ = NULL; GError * _inner_error_ = NULL; -#line 1630 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1632 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1630 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1632 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE (state)); -#line 1631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1633 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_master_file_format (self); -#line 1631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1633 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { -#line 1632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1634 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12862 "Photo.c" +#line 12877 "Photo.c" } -#line 1634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = state; -#line 1634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1636 "/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 1634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" reimport_state = _tmp2_; -#line 12870 "Photo.c" +#line 12885 "Photo.c" { GeeIterator* _dev_it = NULL; PhotoReimportRawDevelopmentStateImpl* _tmp3_ = NULL; GeeCollection* _tmp4_ = NULL; GeeIterator* _tmp5_ = NULL; -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = reimport_state; -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->list; -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" _dev_it = _tmp5_; -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 12886 "Photo.c" +#line 12901 "Photo.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; PhotoReimportRawDevelopmentStateImplDevToReimport* dev = NULL; @@ -12892,105 +12907,105 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop gpointer _tmp9_ = NULL; PhotoReimportRawDevelopmentStateImpl* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _dev_it; -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp7_) { -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 12902 "Photo.c" +#line 12917 "Photo.c" } -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _dev_it; -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" dev = (PhotoReimportRawDevelopmentStateImplDevToReimport*) _tmp9_; -#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = reimport_state; -#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1639 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_->metadata_only; -#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1639 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp11_) { -#line 12916 "Photo.c" +#line 12931 "Photo.c" BackingPhotoTable* _tmp12_ = NULL; BackingPhotoTable* _tmp13_ = NULL; PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_ = NULL; BackingPhotoRow* _tmp15_ = NULL; -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = backing_photo_table_get_instance (); -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = dev; -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->backing; -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_update (_tmp13_, _tmp15_, &_inner_error_); -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp13_); -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_dev_it); -#line 1638 "/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 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12947 "Photo.c" +#line 12962 "Photo.c" } else { -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_dev_it); -#line 1638 "/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 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/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 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12961 "Photo.c" +#line 12976 "Photo.c" } } { PhotoRow* _tmp16_ = NULL; -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->row; -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 12970 "Photo.c" +#line 12985 "Photo.c" { gint _tmp17_ = 0; RawDeveloper* _tmp18_ = NULL; -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = raw_developer_as_array (&_tmp17_); -#line 12976 "Photo.c" +#line 12991 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; gint _d_collection_size_ = 0; gint d_it = 0; -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = _tmp18_; -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" d_collection_length1 = _tmp17_; -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" for (d_it = 0; d_it < _tmp17_; d_it = d_it + 1) { -#line 12988 "Photo.c" +#line 13003 "Photo.c" RawDeveloper d = 0; -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 12992 "Photo.c" +#line 13007 "Photo.c" { BackingPhotoID id = {0}; PhotoRow* _tmp19_ = NULL; @@ -13000,154 +13015,154 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop BackingPhotoID _tmp22_ = {0}; BackingPhotoID _tmp23_ = {0}; gint64 _tmp24_ = 0LL; -#line 1643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 1643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_->development_ids; -#line 1643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20__length1 = _tmp19_->development_ids_length1; -#line 1643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = d; -#line 1643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp20_[_tmp21_]; -#line 1643 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" id = _tmp22_; -#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = id; -#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_.id; -#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_ != BACKING_PHOTO_ID_INVALID) { -#line 13020 "Photo.c" +#line 13035 "Photo.c" BackingPhotoRow* bpr = NULL; BackingPhotoID _tmp25_ = {0}; BackingPhotoRow* _tmp26_ = NULL; BackingPhotoRow* _tmp27_ = NULL; -#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = id; -#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = photo_get_backing_row (self, &_tmp25_); -#line 1645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" bpr = _tmp26_; -#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = bpr; -#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1648 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp27_ != NULL) { -#line 13035 "Photo.c" +#line 13050 "Photo.c" GeeHashMap* _tmp28_ = NULL; RawDeveloper _tmp29_ = 0; BackingPhotoRow* _tmp30_ = NULL; -#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = self->priv->developments; -#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = d; -#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = bpr; -#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1649 "/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 13047 "Photo.c" +#line 13062 "Photo.c" } -#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1646 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 13051 "Photo.c" +#line 13066 "Photo.c" } } } -#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1644 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 13057 "Photo.c" +#line 13072 "Photo.c" } } - __finally306: + __finally307: { PhotoRow* _tmp31_ = NULL; -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = self->row; -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13067 "Photo.c" +#line 13082 "Photo.c" } -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1642 "/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 1642 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_dev_it); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1642 "/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 1642 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13083 "Photo.c" +#line 13098 "Photo.c" } else { -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1642 "/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 1642 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_dev_it); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1642 "/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 1642 "/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 1642 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1642 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13097 "Photo.c" +#line 13112 "Photo.c" } } } } -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); -#line 13104 "Photo.c" +#line 13119 "Photo.c" } -#line 1636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1638 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_dev_it); -#line 13108 "Photo.c" +#line 13123 "Photo.c" } -#line 1654 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1656 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); -#line 1654 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1656 "/home/jens/Source/shotwell/src/Photo.vala" list = _tmp32_; -#line 1655 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = reimport_state; -#line 1655 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_->metadata_only; -#line 1655 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp34_) { -#line 13120 "Photo.c" +#line 13135 "Photo.c" const gchar* _tmp35_ = NULL; gchar* _tmp36_ = NULL; -#line 1656 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = list; -#line 1656 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = g_strconcat (_tmp35_, "image:editable,image:baseline", NULL); -#line 1656 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); -#line 1656 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" list = _tmp36_; -#line 13131 "Photo.c" +#line 13146 "Photo.c" } -#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = list; -#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = alteration_new_from_list (_tmp37_); -#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp38_; -#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1660 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_); -#line 1658 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp39_); #line 1660 "/home/jens/Source/shotwell/src/Photo.vala" + _alteration_unref0 (_tmp39_); +#line 1662 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 1630 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1632 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); -#line 1630 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1632 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); -#line 13149 "Photo.c" +#line 13164 "Photo.c" } @@ -13155,15 +13170,15 @@ static gchar* photo_real_get_typename (DataSource* base) { Photo * self; gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 1663 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1665 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1666 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = g_strdup (PHOTO_TYPENAME); -#line 1664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1666 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 1664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1666 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13165 "Photo.c" +#line 13180 "Photo.c" } @@ -13172,17 +13187,17 @@ static gint64 photo_real_get_instance_id (DataSource* base) { gint64 result = 0LL; PhotoID _tmp0_ = {0}; gint64 _tmp1_ = 0LL; -#line 1667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1669 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1670 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp0_); -#line 1668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1670 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_.id; -#line 1668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1670 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 1668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1670 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13184 "Photo.c" +#line 13199 "Photo.c" } @@ -13194,25 +13209,25 @@ static gchar* photo_real_get_source_id (DataSource* base) { gint64 _tmp2_ = 0LL; gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; -#line 1671 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1673 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = data_source_get_typename (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource)); -#line 1675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource)); -#line 1675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = g_strdup_printf ("%s%016" G_GINT64_MODIFIER "x", _tmp1_, _tmp2_); -#line 1675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 1675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp1_); -#line 1675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 1675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1677 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13214 "Photo.c" +#line 13229 "Photo.c" } @@ -13222,25 +13237,25 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { GTimeVal _tmp1_ = {0}; gboolean _tmp21_ = FALSE; GError * _inner_error_ = NULL; -#line 1679 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1681 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1679 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1681 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 1680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1682 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = info; -#line 1680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1682 "/home/jens/Source/shotwell/src/Photo.vala" g_file_info_get_modification_time (_tmp0_, &_tmp1_); -#line 1680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1682 "/home/jens/Source/shotwell/src/Photo.vala" modification = _tmp1_; -#line 13234 "Photo.c" +#line 13249 "Photo.c" { { PhotoRow* _tmp2_ = NULL; -#line 1683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 1683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 13242 "Photo.c" +#line 13257 "Photo.c" { PhotoRow* _tmp3_ = NULL; BackingPhotoRow* _tmp4_ = NULL; @@ -13257,148 +13272,148 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { BackingPhotoRow* _tmp16_ = NULL; GTimeVal _tmp17_ = {0}; glong _tmp18_ = 0L; -#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->master; -#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->timestamp; -#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = modification; -#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_.tv_sec; -#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1686 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ == ((time_t) _tmp7_)) { -#line 13271 "Photo.c" +#line 13286 "Photo.c" { PhotoRow* _tmp8_ = NULL; -#line 1683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; -#line 1683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13278 "Photo.c" +#line 13293 "Photo.c" } -#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1687 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13282 "Photo.c" +#line 13297 "Photo.c" } -#line 1687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_table_get_instance (); -#line 1687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_; -#line 1687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 1687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->photo_id; -#line 1687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = modification; -#line 1687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_.tv_sec; -#line 1687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_update_timestamp (_tmp10_, &_tmp12_, (time_t) _tmp14_, &_inner_error_); -#line 1687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp10_); -#line 1687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1689 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13302 "Photo.c" - goto __finally308; +#line 13317 "Photo.c" + goto __finally309; } -#line 1688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1690 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 1688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1690 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_->master; -#line 1688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1690 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = modification; -#line 1688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1690 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_.tv_sec; -#line 1688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1690 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_->timestamp = (time_t) _tmp18_; -#line 13315 "Photo.c" +#line 13330 "Photo.c" } - __finally308: + __finally309: { PhotoRow* _tmp19_ = NULL; -#line 1683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 1683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13324 "Photo.c" +#line 13339 "Photo.c" } -#line 1683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 13330 "Photo.c" - goto __catch307_database_error; +#line 13345 "Photo.c" + goto __catch308_database_error; } -#line 1683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/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 1683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1685 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13339 "Photo.c" +#line 13354 "Photo.c" } } } - goto __finally307; - __catch307_database_error: + goto __finally308; + __catch308_database_error: { GError* err = NULL; GError* _tmp20_ = NULL; -#line 1682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1693 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = err; -#line 1691 "/home/jens/Source/shotwell/src/Photo.vala" - app_window_database_error (_tmp20_); #line 1693 "/home/jens/Source/shotwell/src/Photo.vala" + app_window_database_error (_tmp20_); +#line 1695 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 1693 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1695 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13360 "Photo.c" +#line 13375 "Photo.c" } - __finally307: -#line 1682 "/home/jens/Source/shotwell/src/Photo.vala" + __finally308: +#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1684 "/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 1682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1684 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13371 "Photo.c" +#line 13386 "Photo.c" } -#line 1696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1698 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_is_master_baseline (self); -#line 1696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1698 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 13377 "Photo.c" +#line 13392 "Photo.c" Alteration* _tmp22_ = NULL; Alteration* _tmp23_ = NULL; -#line 1697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = alteration_new_from_list ("metadata:master-timestamp,metadata:baseline-timestamp"); -#line 1697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_; -#line 1697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1699 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_); -#line 1697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1699 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp23_); -#line 13388 "Photo.c" +#line 13403 "Photo.c" } else { Alteration* _tmp24_ = NULL; Alteration* _tmp25_ = NULL; -#line 1699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1701 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = alteration_new ("metadata", "master-timestamp"); -#line 1699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1701 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_; -#line 1699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1701 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); -#line 1699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1701 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp25_); -#line 13400 "Photo.c" +#line 13415 "Photo.c" } } @@ -13410,60 +13425,60 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr gboolean altered = FALSE; gboolean _tmp20_ = FALSE; GError * _inner_error_ = NULL; -#line 1703 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1705 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1703 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1705 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1706 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = info; -#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1706 "/home/jens/Source/shotwell/src/Photo.vala" g_file_info_get_modification_time (_tmp0_, &_tmp1_); -#line 1704 "/home/jens/Source/shotwell/src/Photo.vala" - modification = _tmp1_; #line 1706 "/home/jens/Source/shotwell/src/Photo.vala" + modification = _tmp1_; +#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" altered = FALSE; -#line 13424 "Photo.c" +#line 13439 "Photo.c" { PhotoRow* _tmp2_ = NULL; -#line 1707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 1707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 13431 "Photo.c" +#line 13446 "Photo.c" { gboolean _tmp3_ = FALSE; PhotoRow* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = backing_photo_id_is_valid (&_tmp4_->editable_id); -#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 13442 "Photo.c" +#line 13457 "Photo.c" BackingPhotoRow* _tmp6_ = NULL; time_t _tmp7_ = 0; GTimeVal _tmp8_ = {0}; glong _tmp9_ = 0L; -#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->editable; -#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->timestamp; -#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = modification; -#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_.tv_sec; -#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp7_ != ((time_t) _tmp9_); -#line 13457 "Photo.c" +#line 13472 "Photo.c" } else { -#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = FALSE; -#line 13461 "Photo.c" +#line 13476 "Photo.c" } -#line 1708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1710 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_) { -#line 13465 "Photo.c" +#line 13480 "Photo.c" BackingPhotoTable* _tmp10_ = NULL; BackingPhotoTable* _tmp11_ = NULL; PhotoRow* _tmp12_ = NULL; @@ -13473,96 +13488,96 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr BackingPhotoRow* _tmp16_ = NULL; GTimeVal _tmp17_ = {0}; glong _tmp18_ = 0L; -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = backing_photo_table_get_instance (); -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->row; -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_->editable_id; -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = modification; -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_.tv_sec; -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_update_timestamp (_tmp11_, &_tmp13_, (time_t) _tmp15_, &_inner_error_); -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp11_); -#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13493 "Photo.c" - goto __finally309; +#line 13508 "Photo.c" + goto __finally310; } -#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->editable; -#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = modification; -#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_.tv_sec; -#line 1711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_->timestamp = (time_t) _tmp18_; -#line 1712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1714 "/home/jens/Source/shotwell/src/Photo.vala" altered = TRUE; -#line 13506 "Photo.c" +#line 13521 "Photo.c" } } - __finally309: + __finally310: { PhotoRow* _tmp19_ = NULL; -#line 1707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 1707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13516 "Photo.c" +#line 13531 "Photo.c" } -#line 1707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13526 "Photo.c" +#line 13541 "Photo.c" } else { -#line 1707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/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 1707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1707 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1709 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13534 "Photo.c" +#line 13549 "Photo.c" } } } -#line 1716 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = altered; -#line 1716 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1718 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp20_) { -#line 13542 "Photo.c" +#line 13557 "Photo.c" Alteration* _tmp21_ = NULL; Alteration* _tmp22_ = NULL; -#line 1717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1719 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = alteration_new_from_list ("metadata:editable-timestamp,metadata:baseline-timestamp"); -#line 1717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1719 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_; -#line 1717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1719 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp22_); -#line 1717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1719 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp22_); -#line 13553 "Photo.c" +#line 13568 "Photo.c" } } void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { GError * _inner_error_ = NULL; -#line 1721 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_if_fail (GEE_IS_MAP (map)); #line 1723 "/home/jens/Source/shotwell/src/Photo.vala" + g_return_if_fail (GEE_IS_MAP (map)); +#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" database_table_begin_transaction (); -#line 13564 "Photo.c" +#line 13579 "Photo.c" { GeeIterator* _photo_it = NULL; GeeMap* _tmp0_ = NULL; @@ -13571,25 +13586,25 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { GeeSet* _tmp3_ = NULL; GeeIterator* _tmp4_ = NULL; GeeIterator* _tmp5_ = NULL; -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = map; -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_map_get_keys (_tmp0_); -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _photo_it = _tmp5_; -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 13591 "Photo.c" +#line 13606 "Photo.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; Photo* photo = NULL; @@ -13600,90 +13615,90 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { Photo* _tmp12_ = NULL; gpointer _tmp13_ = NULL; GFileInfo* _tmp14_ = NULL; -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _photo_it; -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp7_) { -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 13610 "Photo.c" +#line 13625 "Photo.c" } -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _photo_it; -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" photo = (Photo*) _tmp9_; -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo; -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = map; -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo; -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = gee_map_get (_tmp11_, _tmp12_); -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = (GFileInfo*) _tmp13_; -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" photo_update_editable_modification_time (_tmp10_, _tmp14_, &_inner_error_); -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp14_); -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13644 "Photo.c" +#line 13659 "Photo.c" } else { -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/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 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1727 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13656 "Photo.c" +#line 13671 "Photo.c" } } -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 13661 "Photo.c" +#line 13676 "Photo.c" } -#line 1724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 13665 "Photo.c" +#line 13680 "Photo.c" } -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" database_table_commit_transaction (&_inner_error_); -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13677 "Photo.c" +#line 13692 "Photo.c" } else { -#line 1726 "/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 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1728 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13685 "Photo.c" +#line 13700 "Photo.c" } } } @@ -13695,34 +13710,34 @@ static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSourc PhotoFileFormat _tmp0_ = 0; PhotoFileFormat _tmp1_ = 0; gboolean _tmp2_ = FALSE; -#line 1729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1731 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_file_format (self); -#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_format_can_write_image (_tmp1_); -#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 13705 "Photo.c" +#line 13720 "Photo.c" PhotoFileFormat _tmp3_ = 0; -#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_file_format (self); -#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 13711 "Photo.c" +#line 13726 "Photo.c" } else { PhotoFileFormat _tmp4_ = 0; -#line 1731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1733 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_file_format_get_system_default_format (); -#line 1731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1733 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp4_; -#line 13718 "Photo.c" +#line 13733 "Photo.c" } -#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 1730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1732 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13724 "Photo.c" +#line 13739 "Photo.c" } @@ -13735,35 +13750,35 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale GdkPixbuf* _tmp3_ = NULL; GdkPixbuf* _tmp4_ = NULL; GError * _inner_error_ = NULL; -#line 1734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1736 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = scale; -#line 1735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" scaling_for_best_fit (_tmp1_, TRUE, &_tmp2_); -#line 1735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/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 1735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 1735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 13753 "Photo.c" +#line 13768 "Photo.c" } -#line 1735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp0_; -#line 1735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 1735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 1735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 1735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1737 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13765 "Photo.c" +#line 13780 "Photo.c" } @@ -13772,41 +13787,41 @@ gboolean photo_is_file_image (GFile* file) { gboolean _tmp0_ = FALSE; GFile* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 1738 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1740 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 1742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1744 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file; -#line 1742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1744 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_format_is_file_supported (_tmp1_); -#line 1742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1744 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 1743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 13784 "Photo.c" +#line 13799 "Photo.c" } else { GFile* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 1743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; -#line 1743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = g_file_get_basename (_tmp3_); -#line 1743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 1743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_is_extension_found (_tmp5_, PHOTO_IMAGE_EXTENSIONS, G_N_ELEMENTS (PHOTO_IMAGE_EXTENSIONS)); -#line 1743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp6_; -#line 1743 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp5_); -#line 13802 "Photo.c" +#line 13817 "Photo.c" } -#line 1742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1744 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 1742 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1744 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13808 "Photo.c" +#line 13823 "Photo.c" } @@ -13822,102 +13837,102 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi gchar* _tmp5_ = NULL; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (basename != NULL, FALSE); #line 1748 "/home/jens/Source/shotwell/src/Photo.vala" + g_return_val_if_fail (basename != NULL, FALSE); +#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = basename; -#line 1748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" disassemble_filename (_tmp0_, &_tmp1_, &_tmp2_); -#line 1748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 1748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" name = _tmp1_; -#line 1748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 1748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" ext = _tmp2_; -#line 1749 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = ext; -#line 1749 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ == NULL) { -#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1752 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1752 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1752 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 1750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1752 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13850 "Photo.c" +#line 13865 "Photo.c" } -#line 1753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = ext; -#line 1753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = g_utf8_strdown (_tmp4_, (gssize) -1); -#line 1753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1755 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 1753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1755 "/home/jens/Source/shotwell/src/Photo.vala" ext = _tmp5_; -#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = extensions; -#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6__length1 = extensions_length1; -#line 13864 "Photo.c" +#line 13879 "Photo.c" { gchar** extension_collection = NULL; gint extension_collection_length1 = 0; gint _extension_collection_size_ = 0; gint extension_it = 0; -#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" extension_collection = _tmp6_; -#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" extension_collection_length1 = _tmp6__length1; -#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" for (extension_it = 0; extension_it < _tmp6__length1; extension_it = extension_it + 1) { -#line 13876 "Photo.c" +#line 13891 "Photo.c" gchar* _tmp7_ = NULL; gchar* extension = NULL; -#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = g_strdup (extension_collection[extension_it]); -#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" extension = _tmp7_; -#line 13883 "Photo.c" +#line 13898 "Photo.c" { const gchar* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; -#line 1757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1759 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = ext; -#line 1757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1759 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = extension; -#line 1757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1759 "/home/jens/Source/shotwell/src/Photo.vala" if (g_strcmp0 (_tmp8_, _tmp9_) == 0) { -#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1760 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1760 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (extension); -#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1760 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1760 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1760 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13903 "Photo.c" +#line 13918 "Photo.c" } -#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1758 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (extension); -#line 13907 "Photo.c" +#line 13922 "Photo.c" } } } -#line 1761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 1761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 1761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 1761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13919 "Photo.c" +#line 13934 "Photo.c" } @@ -13931,31 +13946,31 @@ gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gcha PhotoFileFormat _tmp5_ = 0; gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; -#line 1767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1769 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); -#line 1770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); -#line 1770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = file; -#line 1770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = thumbnail_md5; -#line 1770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = full_md5; -#line 1770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = file_format; -#line 1770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_table_has_duplicate (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 1770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 1770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); -#line 1770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp7_; -#line 1770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1772 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13957 "Photo.c" +#line 13972 "Photo.c" } @@ -13973,43 +13988,43 @@ PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const gint _tmp8__length1 = 0; PhotoID* _tmp9_ = NULL; gint _tmp9__length1 = 0; -#line 1776 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1778 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = file; -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = thumbnail_md5; -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = full_md5; -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = file_format; -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_table_get_duplicate_ids (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_); -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8__length1 = _tmp6_; -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9__length1 = _tmp8__length1; -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp9__length1; -#line 14005 "Photo.c" +#line 14020 "Photo.c" } -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp9_; -#line 1779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1781 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14011 "Photo.c" +#line 14026 "Photo.c" } @@ -14018,19 +14033,19 @@ gint64 photo_get_photo_key (DataSource* source) { DataSource* _tmp0_ = NULL; PhotoID _tmp1_ = {0}; gint64 _tmp2_ = 0LL; -#line 1786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1788 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL); -#line 1787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1789 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = source; -#line 1787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1789 "/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 1787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1789 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_.id; -#line 1787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1789 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 1787 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1789 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14032 "Photo.c" +#line 14047 "Photo.c" } @@ -14041,91 +14056,91 @@ static GFile* photo_real_get_file (MediaSource* base) { PhotoFileReader* _tmp1_ = NULL; GFile* _tmp2_ = NULL; GFile* _tmp3_ = NULL; -#line 1805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1807 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_source_reader (self); -#line 1806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1808 "/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 1806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp1_); -#line 1806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 1806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14059 "Photo.c" +#line 14074 "Photo.c" } static void _vala_array_add96 (gchar*** array, int* length, int* size, gchar* value) { -#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14070 "Photo.c" +#line 14085 "Photo.c" } -#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14076 "Photo.c" +#line 14091 "Photo.c" } static void _vala_array_add97 (gchar*** array, int* length, int* size, gchar* value) { -#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14087 "Photo.c" +#line 14102 "Photo.c" } -#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14093 "Photo.c" +#line 14108 "Photo.c" } static void _vala_array_add98 (gchar*** array, int* length, int* size, gchar* value) { -#line 1857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14104 "Photo.c" +#line 14119 "Photo.c" } -#line 1857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14110 "Photo.c" +#line 14125 "Photo.c" } static void _vala_array_add99 (gchar*** array, int* length, int* size, gchar* value) { -#line 1860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14121 "Photo.c" +#line 14136 "Photo.c" } -#line 1860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14127 "Photo.c" +#line 14142 "Photo.c" } @@ -14140,43 +14155,43 @@ void photo_set_master_file (Photo* self, GFile* file) { GFile* old_file = NULL; gboolean _tmp41_ = FALSE; GError * _inner_error_ = NULL; -#line 1811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1813 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1813 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); -#line 1812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1814 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file; -#line 1812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1814 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 1812 "/home/jens/Source/shotwell/src/Photo.vala" - filepath = _tmp1_; #line 1814 "/home/jens/Source/shotwell/src/Photo.vala" + filepath = _tmp1_; +#line 1816 "/home/jens/Source/shotwell/src/Photo.vala" altered = FALSE; -#line 1815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1817 "/home/jens/Source/shotwell/src/Photo.vala" is_baseline = FALSE; -#line 1816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1818 "/home/jens/Source/shotwell/src/Photo.vala" is_source = FALSE; -#line 1817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1819 "/home/jens/Source/shotwell/src/Photo.vala" name_changed = FALSE; -#line 1818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1820 "/home/jens/Source/shotwell/src/Photo.vala" old_file = NULL; -#line 14162 "Photo.c" +#line 14177 "Photo.c" { { PhotoRow* _tmp2_ = NULL; -#line 1820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 1820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 14170 "Photo.c" +#line 14185 "Photo.c" { { PhotoBackingReaders* _tmp3_ = NULL; -#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 14178 "Photo.c" +#line 14193 "Photo.c" { PhotoBackingReaders* _tmp4_ = NULL; PhotoFileReader* _tmp5_ = NULL; @@ -14184,25 +14199,25 @@ void photo_set_master_file (Photo* self, GFile* file) { GFile* _tmp7_ = NULL; GFile* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->master; -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1824 "/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 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" old_file = _tmp6_; -#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = file; -#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = old_file; -#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = g_file_equal (_tmp7_, _tmp8_); -#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1825 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp9_) { -#line 14204 "Photo.c" +#line 14219 "Photo.c" PhotoTable* _tmp10_ = NULL; PhotoTable* _tmp11_ = NULL; PhotoID _tmp12_ = {0}; @@ -14225,196 +14240,196 @@ void photo_set_master_file (Photo* self, GFile* file) { PhotoRow* _tmp29_ = NULL; const gchar* _tmp30_ = NULL; gboolean _tmp31_ = FALSE; -#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_table_get_instance (); -#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp12_); -#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = filepath; -#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_set_filepath (_tmp11_, &_tmp12_, _tmp13_, &_inner_error_); -#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp11_); -#line 1824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14241 "Photo.c" - goto __finally312; +#line 14256 "Photo.c" + goto __finally313; } -#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->master; -#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = filepath; -#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = g_strdup (_tmp16_); -#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp15_->filepath); -#line 1826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_->filepath = _tmp17_; -#line 1827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = file; -#line 1827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = g_file_get_basename (_tmp18_); -#line 1827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1829 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->priv->file_title); -#line 1827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1829 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->file_title = _tmp19_; -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->priv->readers; -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = self->row; -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_->master; -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_->file_format; -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = filepath; -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = photo_file_format_create_reader (_tmp23_, _tmp24_); -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1830 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp20_->master); -#line 1828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_->master = _tmp25_; #line 1830 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp20_->master = _tmp25_; +#line 1832 "/home/jens/Source/shotwell/src/Photo.vala" altered = TRUE; -#line 1831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = photo_is_master_baseline (self); -#line 1831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" is_baseline = _tmp26_; -#line 1832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1834 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = photo_is_master_source (self); -#line 1832 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1834 "/home/jens/Source/shotwell/src/Photo.vala" is_source = _tmp27_; -#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1835 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = self->row; -#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1835 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_->title; -#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1835 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = is_string_empty (_tmp30_); -#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1835 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp31_) { -#line 14298 "Photo.c" +#line 14313 "Photo.c" GFile* _tmp32_ = NULL; gchar* _tmp33_ = NULL; gchar* _tmp34_ = NULL; GFile* _tmp35_ = NULL; gchar* _tmp36_ = NULL; gchar* _tmp37_ = NULL; -#line 1834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = old_file; -#line 1834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = g_file_get_basename (_tmp32_); -#line 1834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_; -#line 1834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = file; -#line 1834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = g_file_get_basename (_tmp35_); -#line 1834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_; -#line 1834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = g_strcmp0 (_tmp34_, _tmp37_) != 0; -#line 1834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp37_); -#line 1834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1836 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp34_); -#line 14323 "Photo.c" +#line 14338 "Photo.c" } else { -#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1835 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = FALSE; -#line 14327 "Photo.c" +#line 14342 "Photo.c" } -#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1835 "/home/jens/Source/shotwell/src/Photo.vala" name_changed = _tmp28_; -#line 14331 "Photo.c" +#line 14346 "Photo.c" } } - __finally312: + __finally313: { PhotoBackingReaders* _tmp38_ = NULL; -#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = self->priv->readers; -#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 14341 "Photo.c" +#line 14356 "Photo.c" } -#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1823 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14345 "Photo.c" - goto __finally311; +#line 14360 "Photo.c" + goto __finally312; } } } - __finally311: + __finally312: { PhotoRow* _tmp39_ = NULL; -#line 1820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = self->row; -#line 1820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 14357 "Photo.c" +#line 14372 "Photo.c" } -#line 1820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 14363 "Photo.c" - goto __catch310_database_error; +#line 14378 "Photo.c" + goto __catch311_database_error; } -#line 1820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 1820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1822 "/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 1820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1820 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1822 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14376 "Photo.c" +#line 14391 "Photo.c" } } } - goto __finally310; - __catch310_database_error: + goto __finally311; + __catch311_database_error: { GError* err = NULL; GError* _tmp40_ = NULL; -#line 1819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1839 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = err; -#line 1839 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1841 "/home/jens/Source/shotwell/src/Photo.vala" app_window_database_error (_tmp40_); -#line 1819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 14395 "Photo.c" +#line 14410 "Photo.c" } - __finally310: -#line 1819 "/home/jens/Source/shotwell/src/Photo.vala" + __finally311: +#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 1819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1821 "/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 1819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1821 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14410 "Photo.c" +#line 14425 "Photo.c" } -#line 1842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = altered; -#line 1842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 14416 "Photo.c" +#line 14431 "Photo.c" GFile* _tmp42_ = NULL; GFile* _tmp43_ = NULL; gboolean _tmp44_ = FALSE; @@ -14432,162 +14447,162 @@ void photo_set_master_file (Photo* self, GFile* file) { gint _tmp57__length1 = 0; Alteration* _tmp58_ = NULL; Alteration* _tmp59_ = NULL; -#line 1843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1845 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = old_file; -#line 1843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1845 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = file; -#line 1843 "/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 1845 "/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" _tmp44_ = is_baseline; -#line 1845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1847 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp44_) { -#line 1846 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1848 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 14446 "Photo.c" +#line 14461 "Photo.c" } -#line 1848 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1850 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = g_new0 (gchar*, 0 + 1); -#line 1848 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1850 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = _tmp45_; -#line 1848 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1850 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list_length1 = 0; -#line 1848 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1850 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_list_size_ = alteration_list_length1; -#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = alteration_list; -#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46__length1 = alteration_list_length1; -#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = g_strdup ("backing:master"); -#line 1849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1851 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add96 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_); -#line 1853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = name_changed; -#line 1853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp48_) { -#line 14468 "Photo.c" +#line 14483 "Photo.c" gchar** _tmp49_ = NULL; gint _tmp49__length1 = 0; gchar* _tmp50_ = NULL; -#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = alteration_list; -#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49__length1 = alteration_list_length1; -#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = g_strdup ("metadata:name"); -#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add97 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_); -#line 14480 "Photo.c" +#line 14495 "Photo.c" } -#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1858 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = is_source; -#line 1856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1858 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp51_) { -#line 14486 "Photo.c" +#line 14501 "Photo.c" gchar** _tmp52_ = NULL; gint _tmp52__length1 = 0; gchar* _tmp53_ = NULL; -#line 1857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = alteration_list; -#line 1857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52__length1 = alteration_list_length1; -#line 1857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = g_strdup ("backing:source"); -#line 1857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add98 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_); -#line 14498 "Photo.c" +#line 14513 "Photo.c" } -#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1861 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = is_baseline; -#line 1859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1861 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp54_) { -#line 14504 "Photo.c" +#line 14519 "Photo.c" gchar** _tmp55_ = NULL; gint _tmp55__length1 = 0; gchar* _tmp56_ = NULL; -#line 1860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = alteration_list; -#line 1860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55__length1 = alteration_list_length1; -#line 1860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = g_strdup ("backing:baseline"); -#line 1860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add99 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_); -#line 14516 "Photo.c" +#line 14531 "Photo.c" } -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = alteration_list; -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57__length1 = alteration_list_length1; -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = alteration_new_from_array (_tmp57_, _tmp57__length1); -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = _tmp58_; -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp59_); -#line 1862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp59_); -#line 1842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); -#line 14532 "Photo.c" +#line 14547 "Photo.c" } -#line 1811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1813 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1813 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 14538 "Photo.c" +#line 14553 "Photo.c" } static void _vala_array_add100 (gchar*** array, int* length, int* size, gchar* value) { -#line 1902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14549 "Photo.c" +#line 14564 "Photo.c" } -#line 1902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14555 "Photo.c" +#line 14570 "Photo.c" } static void _vala_array_add101 (gchar*** array, int* length, int* size, gchar* value) { -#line 1905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14566 "Photo.c" +#line 14581 "Photo.c" } -#line 1905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14572 "Photo.c" +#line 14587 "Photo.c" } static void _vala_array_add102 (gchar*** array, int* length, int* size, gchar* value) { -#line 1908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 1908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14583 "Photo.c" +#line 14598 "Photo.c" } -#line 1908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 1908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14589 "Photo.c" +#line 14604 "Photo.c" } @@ -14601,41 +14616,41 @@ void photo_set_editable_file (Photo* self, GFile* file) { GFile* old_file = NULL; gboolean _tmp34_ = FALSE; GError * _inner_error_ = NULL; -#line 1868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 1868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); -#line 1869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file; -#line 1869 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1871 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 1869 "/home/jens/Source/shotwell/src/Photo.vala" - filepath = _tmp1_; #line 1871 "/home/jens/Source/shotwell/src/Photo.vala" + filepath = _tmp1_; +#line 1873 "/home/jens/Source/shotwell/src/Photo.vala" altered = FALSE; -#line 1872 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1874 "/home/jens/Source/shotwell/src/Photo.vala" is_baseline = FALSE; -#line 1873 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" is_source = FALSE; -#line 1874 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1876 "/home/jens/Source/shotwell/src/Photo.vala" old_file = NULL; -#line 14621 "Photo.c" +#line 14636 "Photo.c" { { PhotoRow* _tmp2_ = NULL; -#line 1876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 1876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 14629 "Photo.c" +#line 14644 "Photo.c" { { PhotoBackingReaders* _tmp3_ = NULL; -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 14637 "Photo.c" +#line 14652 "Photo.c" { GFile* _tmp4_ = NULL; PhotoBackingReaders* _tmp5_ = NULL; @@ -14643,65 +14658,65 @@ void photo_set_editable_file (Photo* self, GFile* file) { GFile* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; GFile* _tmp12_ = NULL; -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->readers; -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->editable; -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != NULL) { -#line 14651 "Photo.c" +#line 14666 "Photo.c" PhotoBackingReaders* _tmp7_ = NULL; PhotoFileReader* _tmp8_ = NULL; GFile* _tmp9_ = NULL; -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->editable; -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/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 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp9_; -#line 14665 "Photo.c" +#line 14680 "Photo.c" } else { -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = NULL; -#line 14671 "Photo.c" +#line 14686 "Photo.c" } -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _g_object_ref0 (_tmp4_); -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" old_file = _tmp10_; -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = old_file; -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_ != NULL) { -#line 14683 "Photo.c" +#line 14698 "Photo.c" GFile* _tmp13_ = NULL; GFile* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = old_file; -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = file; -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = g_file_equal (_tmp13_, _tmp14_); -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = !_tmp15_; -#line 14695 "Photo.c" +#line 14710 "Photo.c" } else { -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; -#line 14699 "Photo.c" +#line 14714 "Photo.c" } -#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1881 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 14703 "Photo.c" +#line 14718 "Photo.c" BackingPhotoTable* _tmp16_ = NULL; BackingPhotoTable* _tmp17_ = NULL; PhotoRow* _tmp18_ = NULL; @@ -14717,150 +14732,150 @@ void photo_set_editable_file (Photo* self, GFile* file) { PhotoFileReader* _tmp28_ = NULL; gboolean _tmp29_ = FALSE; gboolean _tmp30_ = FALSE; -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = backing_photo_table_get_instance (); -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->row; -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->editable_id; -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = filepath; -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_set_filepath (_tmp17_, &_tmp19_, _tmp20_, &_inner_error_); -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp17_); -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 14737 "Photo.c" - goto __finally315; +#line 14752 "Photo.c" + goto __finally316; } -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1884 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = self->priv->editable; -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1884 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = filepath; -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1884 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = g_strdup (_tmp22_); -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1884 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp21_->filepath); -#line 1882 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1884 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_->filepath = _tmp23_; -#line 1883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1885 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = self->priv->readers; -#line 1883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1885 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->priv->editable; -#line 1883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1885 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_->file_format; -#line 1883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1885 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = filepath; -#line 1883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1885 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = photo_file_format_create_reader (_tmp26_, _tmp27_); -#line 1883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1885 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp24_->editable); -#line 1883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_->editable = _tmp28_; #line 1885 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp24_->editable = _tmp28_; +#line 1887 "/home/jens/Source/shotwell/src/Photo.vala" altered = TRUE; -#line 1886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = photo_is_editable_baseline (self); -#line 1886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1888 "/home/jens/Source/shotwell/src/Photo.vala" is_baseline = _tmp29_; -#line 1887 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1889 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = photo_is_editable_source (self); -#line 1887 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1889 "/home/jens/Source/shotwell/src/Photo.vala" is_source = _tmp30_; -#line 14774 "Photo.c" +#line 14789 "Photo.c" } -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 14778 "Photo.c" +#line 14793 "Photo.c" } - __finally315: + __finally316: { PhotoBackingReaders* _tmp31_ = NULL; -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = self->priv->readers; -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 14787 "Photo.c" +#line 14802 "Photo.c" } -#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1879 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14791 "Photo.c" - goto __finally314; +#line 14806 "Photo.c" + goto __finally315; } } } - __finally314: + __finally315: { PhotoRow* _tmp32_ = NULL; -#line 1876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = self->row; -#line 1876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 14803 "Photo.c" +#line 14818 "Photo.c" } -#line 1876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 14809 "Photo.c" - goto __catch313_database_error; +#line 14824 "Photo.c" + goto __catch314_database_error; } -#line 1876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 1876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/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 1876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1878 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14822 "Photo.c" +#line 14837 "Photo.c" } } } - goto __finally313; - __catch313_database_error: + goto __finally314; + __catch314_database_error: { GError* err = NULL; GError* _tmp33_ = NULL; -#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 1892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1894 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = err; -#line 1892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1894 "/home/jens/Source/shotwell/src/Photo.vala" app_window_database_error (_tmp33_); -#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 14841 "Photo.c" +#line 14856 "Photo.c" } - __finally313: -#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" + __finally314: +#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1877 "/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 1875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1877 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14856 "Photo.c" +#line 14871 "Photo.c" } -#line 1895 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = altered; -#line 1895 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp34_) { -#line 14862 "Photo.c" +#line 14877 "Photo.c" GFile* _tmp35_ = NULL; GFile* _tmp36_ = NULL; gboolean _tmp37_ = FALSE; @@ -14877,93 +14892,93 @@ void photo_set_editable_file (Photo* self, GFile* file) { gint _tmp47__length1 = 0; Alteration* _tmp48_ = NULL; Alteration* _tmp49_ = NULL; -#line 1896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1898 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = old_file; -#line 1896 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1898 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = file; -#line 1896 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_editable_replaced (self, _tmp35_, _tmp36_); #line 1898 "/home/jens/Source/shotwell/src/Photo.vala" + photo_notify_editable_replaced (self, _tmp35_, _tmp36_); +#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = is_baseline; -#line 1898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp37_) { -#line 1899 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 14891 "Photo.c" +#line 14906 "Photo.c" } -#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1903 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = g_new0 (gchar*, 0 + 1); -#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1903 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = _tmp38_; -#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1903 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list_length1 = 0; -#line 1901 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1903 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_list_size_ = alteration_list_length1; -#line 1902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = alteration_list; -#line 1902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39__length1 = alteration_list_length1; -#line 1902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = g_strdup ("backing:editable"); -#line 1902 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_); #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" _tmp41_ = is_baseline; -#line 1904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1906 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 14913 "Photo.c" +#line 14928 "Photo.c" gchar** _tmp42_ = NULL; gint _tmp42__length1 = 0; gchar* _tmp43_ = NULL; -#line 1905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = alteration_list; -#line 1905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42__length1 = alteration_list_length1; -#line 1905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = g_strdup ("backing:baseline"); -#line 1905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_); -#line 14925 "Photo.c" +#line 14940 "Photo.c" } -#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1909 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = is_source; -#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1909 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp44_) { -#line 14931 "Photo.c" +#line 14946 "Photo.c" gchar** _tmp45_ = NULL; gint _tmp45__length1 = 0; gchar* _tmp46_ = NULL; -#line 1908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = alteration_list; -#line 1908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45__length1 = alteration_list_length1; -#line 1908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = g_strdup ("backing:source"); -#line 1908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_); -#line 14943 "Photo.c" +#line 14958 "Photo.c" } -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1912 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = alteration_list; -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1912 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47__length1 = alteration_list_length1; -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1912 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = alteration_new_from_array (_tmp47_, _tmp47__length1); -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1912 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = _tmp48_; -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1912 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp49_); -#line 1910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1912 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp49_); -#line 1895 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1897 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); -#line 14959 "Photo.c" +#line 14974 "Photo.c" } -#line 1868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); -#line 1868 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1870 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 14965 "Photo.c" +#line 14980 "Photo.c" } @@ -14972,19 +14987,19 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) { GeeMap* _tmp0_ = NULL; GeeMapIterator* _tmp1_ = NULL; GError * _inner_error_ = NULL; -#line 1915 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1917 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 1916 "/home/jens/Source/shotwell/src/Photo.vala" - database_table_begin_transaction (); #line 1918 "/home/jens/Source/shotwell/src/Photo.vala" + database_table_begin_transaction (); +#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = map; -#line 1918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_map_map_iterator (_tmp0_); -#line 1918 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" map_iter = _tmp1_; -#line 1919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1921 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 14986 "Photo.c" +#line 15001 "Photo.c" GeeMapIterator* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; GeeMapIterator* _tmp4_ = NULL; @@ -14993,64 +15008,64 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) { GeeMapIterator* _tmp7_ = NULL; gpointer _tmp8_ = NULL; GFile* _tmp9_ = NULL; -#line 1919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map_iter; -#line 1919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = gee_map_iterator_next (_tmp2_); -#line 1919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1921 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 1919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1921 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 15003 "Photo.c" +#line 15018 "Photo.c" } -#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map_iter; -#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_map_iterator_get_key (_tmp4_); -#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = (Photo*) _tmp5_; -#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = map_iter; -#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = gee_map_iterator_get_value (_tmp7_); -#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = (GFile*) _tmp8_; -#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_editable_file (_tmp6_, _tmp9_); -#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp9_); -#line 1920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp6_); -#line 15023 "Photo.c" +#line 15038 "Photo.c" } -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" database_table_commit_transaction (&_inner_error_); -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map_iter); -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15037 "Photo.c" +#line 15052 "Photo.c" } else { -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map_iter); -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1924 "/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 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1922 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1924 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15047 "Photo.c" +#line 15062 "Photo.c" } } -#line 1915 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1917 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map_iter); -#line 15052 "Photo.c" +#line 15067 "Photo.c" } @@ -15060,23 +15075,23 @@ GFile* photo_get_actual_file (Photo* self) { PhotoFileReader* _tmp1_ = NULL; GFile* _tmp2_ = NULL; GFile* _tmp3_ = NULL; -#line 1927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1929 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 1928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_baseline_reader (self); -#line 1928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1930 "/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 1928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1930 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp1_); -#line 1928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1930 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 1928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1930 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15078 "Photo.c" +#line 15093 "Photo.c" } @@ -15087,23 +15102,23 @@ static GFile* photo_real_get_master_file (MediaSource* base) { PhotoFileReader* _tmp1_ = NULL; GFile* _tmp2_ = NULL; GFile* _tmp3_ = NULL; -#line 1931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1933 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1934 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_master_reader (self); -#line 1932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1934 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1934 "/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 1932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1934 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1934 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp1_); -#line 1932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1934 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 1932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1934 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15105 "Photo.c" +#line 15120 "Photo.c" } @@ -15113,42 +15128,42 @@ GFile* photo_get_editable_file (Photo* self) { PhotoFileReader* _tmp0_ = NULL; GFile* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; -#line 1935 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1937 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 1936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_editable_reader (self); -#line 1936 "/home/jens/Source/shotwell/src/Photo.vala" - reader = _tmp0_; #line 1938 "/home/jens/Source/shotwell/src/Photo.vala" + reader = _tmp0_; +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; -#line 1938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 15125 "Photo.c" +#line 15140 "Photo.c" PhotoFileReader* _tmp3_ = NULL; GFile* _tmp4_ = NULL; -#line 1938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = reader; -#line 1938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/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 1938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 1938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp4_; -#line 15136 "Photo.c" +#line 15151 "Photo.c" } else { -#line 1938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 1938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 15142 "Photo.c" +#line 15157 "Photo.c" } -#line 1938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 1938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 1938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15150 "Photo.c" +#line 15165 "Photo.c" } @@ -15158,30 +15173,30 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { GeeArrayList* ret = NULL; GeeArrayList* _tmp1_ = NULL; GError * _inner_error_ = NULL; -#line 1941 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1943 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 1942 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1944 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_master_file_format (self); -#line 1942 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1944 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { -#line 1943 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1945 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 1943 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1945 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15170 "Photo.c" +#line 15185 "Photo.c" } -#line 1945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 1945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" ret = _tmp1_; -#line 15176 "Photo.c" +#line 15191 "Photo.c" { PhotoRow* _tmp2_ = NULL; -#line 1946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 1946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15183 "Photo.c" +#line 15198 "Photo.c" { { GeeIterator* _row_it = NULL; @@ -15191,25 +15206,25 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { GeeCollection* _tmp6_ = NULL; GeeIterator* _tmp7_ = NULL; GeeIterator* _tmp8_ = NULL; -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->developments; -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MAP, GeeMap)); -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp6_); -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _row_it = _tmp8_; -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 15211 "Photo.c" +#line 15226 "Photo.c" GeeIterator* _tmp9_ = NULL; gboolean _tmp10_ = FALSE; BackingPhotoRow* row = NULL; @@ -15220,72 +15235,72 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { const gchar* _tmp15_ = NULL; GFile* _tmp16_ = NULL; GFile* _tmp17_ = NULL; -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _row_it; -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = gee_iterator_next (_tmp9_); -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp10_) { -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 15230 "Photo.c" +#line 15245 "Photo.c" } -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _row_it; -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = gee_iterator_get (_tmp11_); -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" row = (BackingPhotoRow*) _tmp12_; -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = ret; -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = row; -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->filepath; -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = g_file_new_for_path (_tmp15_); -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); -#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1950 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp17_); -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 15254 "Photo.c" +#line 15269 "Photo.c" } -#line 1947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1949 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 15258 "Photo.c" +#line 15273 "Photo.c" } } - __finally316: + __finally317: { PhotoRow* _tmp18_ = NULL; -#line 1946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->row; -#line 1946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15268 "Photo.c" +#line 15283 "Photo.c" } -#line 1946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (ret); -#line 1946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1948 "/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 1946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1948 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 15280 "Photo.c" +#line 15295 "Photo.c" } } -#line 1951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1953 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (ret, GEE_TYPE_COLLECTION, GeeCollection); -#line 1951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1953 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15287 "Photo.c" +#line 15302 "Photo.c" } @@ -15295,77 +15310,77 @@ GFile* photo_get_source_file (Photo* self) { PhotoFileReader* _tmp1_ = NULL; GFile* _tmp2_ = NULL; GFile* _tmp3_ = NULL; -#line 1954 "/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 1955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_source_reader (self); -#line 1955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 1955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1957 "/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 1955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 1955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp1_); -#line 1955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 1955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1957 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15313 "Photo.c" +#line 15328 "Photo.c" } PhotoFileFormat photo_get_file_format (Photo* self) { PhotoFileFormat result = 0; GError * _inner_error_ = NULL; -#line 1958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1960 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 15322 "Photo.c" +#line 15337 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15329 "Photo.c" +#line 15344 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; PhotoFileFormat _tmp2_ = 0; -#line 1960 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1962 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->backing_photo_row; -#line 1960 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1962 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->file_format; -#line 1960 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1962 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 15339 "Photo.c" +#line 15354 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15346 "Photo.c" +#line 15361 "Photo.c" } -#line 1960 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1962 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15350 "Photo.c" +#line 15365 "Photo.c" } - __finally317: + __finally318: { PhotoRow* _tmp4_ = NULL; -#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15359 "Photo.c" +#line 15374 "Photo.c" } -#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1961 "/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 1959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1961 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 15367 "Photo.c" +#line 15382 "Photo.c" } } @@ -15376,88 +15391,88 @@ PhotoFileFormat photo_get_best_export_file_format (Photo* self) { PhotoFileFormat _tmp0_ = 0; PhotoFileFormat _tmp1_ = 0; gboolean _tmp2_ = FALSE; -#line 1964 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1966 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 1965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_file_format (self); -#line 1965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" file_format = _tmp0_; -#line 1966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file_format; -#line 1966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_format_can_write (_tmp1_); -#line 1966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp2_) { -#line 15390 "Photo.c" +#line 15405 "Photo.c" PhotoFileFormat _tmp3_ = 0; -#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_format_get_system_default_format (); -#line 1967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1969 "/home/jens/Source/shotwell/src/Photo.vala" file_format = _tmp3_; -#line 15396 "Photo.c" +#line 15411 "Photo.c" } -#line 1969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1971 "/home/jens/Source/shotwell/src/Photo.vala" result = file_format; -#line 1969 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1971 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15402 "Photo.c" +#line 15417 "Photo.c" } PhotoFileFormat photo_get_master_file_format (Photo* self) { PhotoFileFormat result = 0; GError * _inner_error_ = NULL; -#line 1972 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1974 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 15411 "Photo.c" +#line 15426 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 1973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15418 "Photo.c" +#line 15433 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; PhotoFileFormat _tmp3_ = 0; -#line 1974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 1974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; -#line 1974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1976 "/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 1974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 15431 "Photo.c" +#line 15446 "Photo.c" { PhotoRow* _tmp4_ = NULL; -#line 1973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 1973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15438 "Photo.c" +#line 15453 "Photo.c" } -#line 1974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1976 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15442 "Photo.c" +#line 15457 "Photo.c" } - __finally318: + __finally319: { PhotoRow* _tmp5_ = NULL; -#line 1973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 1973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15451 "Photo.c" +#line 15466 "Photo.c" } -#line 1973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1975 "/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 1973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1973 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1975 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 15459 "Photo.c" +#line 15474 "Photo.c" } } @@ -15466,108 +15481,108 @@ static time_t photo_real_get_timestamp (MediaSource* base) { Photo * self; time_t result = 0; GError * _inner_error_ = NULL; -#line 1978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15470 "Photo.c" +#line 15485 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 1979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15477 "Photo.c" +#line 15492 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; time_t _tmp2_ = 0; -#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->backing_photo_row; -#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->timestamp; -#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1982 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 15487 "Photo.c" +#line 15502 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 1979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 1979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15494 "Photo.c" +#line 15509 "Photo.c" } -#line 1980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1982 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15498 "Photo.c" +#line 15513 "Photo.c" } - __finally319: + __finally320: { PhotoRow* _tmp4_ = NULL; -#line 1979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 1979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15507 "Photo.c" +#line 15522 "Photo.c" } -#line 1979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1981 "/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 1979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1981 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 15515 "Photo.c" +#line 15530 "Photo.c" } } void photo_get_photo_id (Photo* self, PhotoID* result) { GError * _inner_error_ = NULL; -#line 1984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1986 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 15524 "Photo.c" +#line 15539 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 1985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15531 "Photo.c" +#line 15546 "Photo.c" { PhotoRow* _tmp1_ = NULL; PhotoID _tmp2_ = {0}; -#line 1986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 1986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->photo_id; -#line 1986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1988 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15541 "Photo.c" +#line 15556 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 1985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 1985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15548 "Photo.c" +#line 15563 "Photo.c" } -#line 1986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1988 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15552 "Photo.c" +#line 15567 "Photo.c" } - __finally320: + __finally321: { PhotoRow* _tmp4_ = NULL; -#line 1985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 1985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15561 "Photo.c" +#line 15576 "Photo.c" } -#line 1985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1987 "/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 1985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 1985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15569 "Photo.c" +#line 15584 "Photo.c" } } @@ -15576,17 +15591,17 @@ static inline void photo_real_get_event_id (MediaSource* base, EventID* result) Photo * self; PhotoRow* _tmp0_ = NULL; EventID _tmp1_ = {0}; -#line 1991 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1993 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 1992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_->event_id; -#line 1992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp1_; -#line 1992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1994 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15588 "Photo.c" +#line 15603 "Photo.c" } @@ -15595,127 +15610,127 @@ inline gint64 photo_get_raw_event_id (Photo* self) { PhotoRow* _tmp0_ = NULL; EventID _tmp1_ = {0}; gint64 _tmp2_ = 0LL; -#line 1996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1998 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0LL); -#line 1997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 1997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_->event_id; -#line 1997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_.id; -#line 1997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1999 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 1997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1999 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15609 "Photo.c" +#line 15624 "Photo.c" } static void photo_real_get_import_id (MediaSource* base, ImportID* result) { Photo * self; GError * _inner_error_ = NULL; -#line 2000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2002 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15618 "Photo.c" +#line 15633 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15625 "Photo.c" +#line 15640 "Photo.c" { PhotoRow* _tmp1_ = NULL; ImportID _tmp2_ = {0}; -#line 2002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2004 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2004 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->import_id; -#line 2002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2004 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15635 "Photo.c" +#line 15650 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 2001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15642 "Photo.c" +#line 15657 "Photo.c" } -#line 2002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2004 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15646 "Photo.c" +#line 15661 "Photo.c" } - __finally321: + __finally322: { PhotoRow* _tmp4_ = NULL; -#line 2001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15655 "Photo.c" +#line 15670 "Photo.c" } -#line 2001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2003 "/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 2001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2003 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15663 "Photo.c" +#line 15678 "Photo.c" } } void photo_get_editable_id (Photo* self, BackingPhotoID* result) { GError * _inner_error_ = NULL; -#line 2006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2008 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 15672 "Photo.c" +#line 15687 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15679 "Photo.c" +#line 15694 "Photo.c" { PhotoRow* _tmp1_ = NULL; BackingPhotoID _tmp2_ = {0}; -#line 2008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2010 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2010 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable_id; -#line 2008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2010 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15689 "Photo.c" +#line 15704 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 2007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15696 "Photo.c" +#line 15711 "Photo.c" } -#line 2008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2010 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15700 "Photo.c" +#line 15715 "Photo.c" } - __finally322: + __finally323: { PhotoRow* _tmp4_ = NULL; -#line 2007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15709 "Photo.c" +#line 15724 "Photo.c" } -#line 2007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2009 "/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 2007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2009 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15717 "Photo.c" +#line 15732 "Photo.c" } } @@ -15724,57 +15739,57 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; -#line 2012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2014 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15728 "Photo.c" +#line 15743 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15735 "Photo.c" +#line 15750 "Photo.c" { PhotoRow* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 2014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->md5; -#line 2014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = g_strdup (_tmp2_); -#line 2014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2016 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 15748 "Photo.c" +#line 15763 "Photo.c" { PhotoRow* _tmp4_ = NULL; -#line 2013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15755 "Photo.c" +#line 15770 "Photo.c" } -#line 2014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2016 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15759 "Photo.c" +#line 15774 "Photo.c" } - __finally323: + __finally324: { PhotoRow* _tmp5_ = NULL; -#line 2013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15768 "Photo.c" +#line 15783 "Photo.c" } -#line 2013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2015 "/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 2013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2015 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 15776 "Photo.c" +#line 15791 "Photo.c" } } @@ -15782,54 +15797,54 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { guint64 photo_get_flags (Photo* self) { guint64 result = 0ULL; GError * _inner_error_ = NULL; -#line 2020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 15786 "Photo.c" +#line 15801 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15793 "Photo.c" +#line 15808 "Photo.c" { PhotoRow* _tmp1_ = NULL; guint64 _tmp2_ = 0ULL; -#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2024 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2024 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; -#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2024 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 15803 "Photo.c" +#line 15818 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 2021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15810 "Photo.c" +#line 15825 "Photo.c" } -#line 2022 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2024 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15814 "Photo.c" +#line 15829 "Photo.c" } - __finally324: + __finally325: { PhotoRow* _tmp4_ = NULL; -#line 2021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15823 "Photo.c" +#line 15838 "Photo.c" } -#line 2021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2023 "/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 2021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2023 "/home/jens/Source/shotwell/src/Photo.vala" return 0ULL; -#line 15831 "Photo.c" +#line 15846 "Photo.c" } } @@ -15839,41 +15854,41 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte Alteration* _tmp0_ = NULL; Alteration* _tmp1_ = NULL; Alteration* _tmp5_ = NULL; -#line 2026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration)); -#line 2027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2029 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = alteration_new ("metadata", "flags"); -#line 2027 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2029 "/home/jens/Source/shotwell/src/Photo.vala" alteration = _tmp0_; -#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2030 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = additional_alteration; -#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2030 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 15853 "Photo.c" +#line 15868 "Photo.c" Alteration* _tmp2_ = NULL; Alteration* _tmp3_ = NULL; Alteration* _tmp4_ = NULL; -#line 2029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2031 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = alteration; -#line 2029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2031 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = additional_alteration; -#line 2029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2031 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = alteration_compress (_tmp2_, _tmp3_); -#line 2029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2031 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (alteration); -#line 2029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2031 "/home/jens/Source/shotwell/src/Photo.vala" alteration = _tmp4_; -#line 15867 "Photo.c" +#line 15882 "Photo.c" } -#line 2031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = alteration; -#line 2031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2033 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_); -#line 2026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2028 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (alteration); -#line 15875 "Photo.c" +#line 15890 "Photo.c" } @@ -15883,18 +15898,18 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_ gboolean _tmp10_ = FALSE; guint64 _tmp12_ = 0ULL; GError * _inner_error_ = NULL; -#line 2034 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2036 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 2034 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2036 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL); -#line 15889 "Photo.c" +#line 15904 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2036 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2036 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15896 "Photo.c" +#line 15911 "Photo.c" { PhotoTable* _tmp1_ = NULL; PhotoTable* _tmp2_ = NULL; @@ -15902,135 +15917,135 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_ guint64 _tmp4_ = 0ULL; gboolean _tmp5_ = FALSE; gboolean _tmp6_ = FALSE; -#line 2037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 2037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp3_); -#line 2037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = flags; -#line 2037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_table_replace_flags (_tmp2_, &_tmp3_, _tmp4_); -#line 2037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp5_; -#line 2037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2040 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = committed; -#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2040 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 15922 "Photo.c" +#line 15937 "Photo.c" PhotoRow* _tmp7_ = NULL; guint64 _tmp8_ = 0ULL; -#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2041 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2041 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = flags; -#line 2039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2041 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_->flags = _tmp8_; -#line 15931 "Photo.c" +#line 15946 "Photo.c" } } - __finally325: + __finally326: { PhotoRow* _tmp9_ = NULL; -#line 2036 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2036 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15941 "Photo.c" +#line 15956 "Photo.c" } -#line 2036 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2036 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2038 "/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 2036 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2036 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2038 "/home/jens/Source/shotwell/src/Photo.vala" return 0ULL; -#line 15951 "Photo.c" +#line 15966 "Photo.c" } } -#line 2042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2044 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = committed; -#line 2042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2044 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_) { -#line 15958 "Photo.c" +#line 15973 "Photo.c" Alteration* _tmp11_ = NULL; -#line 2043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2045 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = additional_alteration; -#line 2043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2045 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_flags_altered (self, _tmp11_); -#line 15964 "Photo.c" +#line 15979 "Photo.c" } -#line 2045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2047 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = flags; -#line 2045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2047 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp12_; -#line 2045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2047 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15972 "Photo.c" +#line 15987 "Photo.c" } gboolean photo_is_flag_set (Photo* self, guint64 mask) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 2048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 15981 "Photo.c" +#line 15996 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15988 "Photo.c" +#line 16003 "Photo.c" { PhotoRow* _tmp1_ = NULL; guint64 _tmp2_ = 0ULL; guint64 _tmp3_ = 0ULL; gboolean _tmp4_ = FALSE; -#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; -#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = mask; -#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_); -#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 16004 "Photo.c" +#line 16019 "Photo.c" { PhotoRow* _tmp5_ = NULL; -#line 2049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16011 "Photo.c" +#line 16026 "Photo.c" } -#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2052 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16015 "Photo.c" +#line 16030 "Photo.c" } - __finally326: + __finally327: { PhotoRow* _tmp6_ = NULL; -#line 2049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16024 "Photo.c" +#line 16039 "Photo.c" } -#line 2049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2051 "/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 2049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2051 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 16032 "Photo.c" +#line 16047 "Photo.c" } } @@ -16041,22 +16056,22 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter gboolean committed = FALSE; gboolean _tmp17_ = FALSE; GError * _inner_error_ = NULL; -#line 2054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2056 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 2054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2056 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL); -#line 2055 "/home/jens/Source/shotwell/src/Photo.vala" - flags = (guint64) 0; #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" + flags = (guint64) 0; +#line 2059 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16051 "Photo.c" +#line 16066 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16058 "Photo.c" +#line 16073 "Photo.c" { PhotoRow* _tmp1_ = NULL; guint64 _tmp2_ = 0ULL; @@ -16065,99 +16080,99 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter PhotoRow* _tmp5_ = NULL; guint64 _tmp6_ = 0ULL; guint64 _tmp7_ = 0ULL; -#line 2059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; -#line 2059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = mask; -#line 2059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_); -#line 2059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" flags = _tmp4_; -#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2062 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2062 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->flags; -#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2062 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = flags; -#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2062 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != _tmp7_) { -#line 16085 "Photo.c" +#line 16100 "Photo.c" PhotoTable* _tmp8_ = NULL; PhotoTable* _tmp9_ = NULL; PhotoID _tmp10_ = {0}; guint64 _tmp11_ = 0ULL; gboolean _tmp12_ = FALSE; gboolean _tmp13_ = FALSE; -#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_table_get_instance (); -#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp10_); -#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = flags; -#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_); -#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp12_; -#line 2061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp9_); -#line 2062 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2064 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = committed; -#line 2062 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2064 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 16110 "Photo.c" +#line 16125 "Photo.c" PhotoRow* _tmp14_ = NULL; guint64 _tmp15_ = 0ULL; -#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2065 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2065 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = flags; -#line 2063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2065 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->flags = _tmp15_; -#line 16119 "Photo.c" +#line 16134 "Photo.c" } } } - __finally327: + __finally328: { PhotoRow* _tmp16_ = NULL; -#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->row; -#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16130 "Photo.c" +#line 16145 "Photo.c" } -#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2060 "/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 2058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" return 0ULL; -#line 16140 "Photo.c" +#line 16155 "Photo.c" } } -#line 2067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2069 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = committed; -#line 2067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2069 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_) { -#line 16147 "Photo.c" +#line 16162 "Photo.c" Alteration* _tmp18_ = NULL; -#line 2068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = additional_alteration; -#line 2068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_flags_altered (self, _tmp18_); -#line 16153 "Photo.c" +#line 16168 "Photo.c" } -#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2072 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; -#line 2070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2072 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16159 "Photo.c" +#line 16174 "Photo.c" } @@ -16167,22 +16182,22 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al gboolean committed = FALSE; gboolean _tmp17_ = FALSE; GError * _inner_error_ = NULL; -#line 2073 "/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 2073 "/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 2074 "/home/jens/Source/shotwell/src/Photo.vala" - flags = (guint64) 0; #line 2076 "/home/jens/Source/shotwell/src/Photo.vala" + flags = (guint64) 0; +#line 2078 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16177 "Photo.c" +#line 16192 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2077 "/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 16184 "Photo.c" +#line 16199 "Photo.c" { PhotoRow* _tmp1_ = NULL; guint64 _tmp2_ = 0ULL; @@ -16191,99 +16206,99 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al PhotoRow* _tmp5_ = NULL; guint64 _tmp6_ = 0ULL; guint64 _tmp7_ = 0ULL; -#line 2078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; -#line 2078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = mask; -#line 2078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_); -#line 2078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" flags = _tmp4_; -#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->flags; -#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = flags; -#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != _tmp7_) { -#line 16211 "Photo.c" +#line 16226 "Photo.c" PhotoTable* _tmp8_ = NULL; PhotoTable* _tmp9_ = NULL; PhotoID _tmp10_ = {0}; guint64 _tmp11_ = 0ULL; gboolean _tmp12_ = FALSE; gboolean _tmp13_ = FALSE; -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_table_get_instance (); -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp10_); -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = flags; -#line 2080 "/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 2080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp12_; -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp9_); -#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2083 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = committed; -#line 2081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2083 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 16236 "Photo.c" +#line 16251 "Photo.c" PhotoRow* _tmp14_ = NULL; guint64 _tmp15_ = 0ULL; -#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2084 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2084 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = flags; -#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2084 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->flags = _tmp15_; -#line 16245 "Photo.c" +#line 16260 "Photo.c" } } } - __finally328: + __finally329: { PhotoRow* _tmp16_ = NULL; -#line 2077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->row; -#line 2077 "/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 16256 "Photo.c" +#line 16271 "Photo.c" } -#line 2077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2077 "/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 2077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2079 "/home/jens/Source/shotwell/src/Photo.vala" return 0ULL; -#line 16266 "Photo.c" +#line 16281 "Photo.c" } } -#line 2086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = committed; -#line 2086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2088 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_) { -#line 16273 "Photo.c" +#line 16288 "Photo.c" Alteration* _tmp18_ = NULL; -#line 2087 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2089 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = additional_alteration; -#line 2087 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2089 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_flags_altered (self, _tmp18_); -#line 16279 "Photo.c" +#line 16294 "Photo.c" } -#line 2089 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2091 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; -#line 2089 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2091 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16285 "Photo.c" +#line 16300 "Photo.c" } @@ -16293,22 +16308,22 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera gboolean committed = FALSE; gboolean _tmp17_ = FALSE; GError * _inner_error_ = NULL; -#line 2092 "/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 2092 "/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 2093 "/home/jens/Source/shotwell/src/Photo.vala" - flags = (guint64) 0; #line 2095 "/home/jens/Source/shotwell/src/Photo.vala" + flags = (guint64) 0; +#line 2097 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16303 "Photo.c" +#line 16318 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2096 "/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 16310 "Photo.c" +#line 16325 "Photo.c" { PhotoRow* _tmp1_ = NULL; guint64 _tmp2_ = 0ULL; @@ -16317,99 +16332,99 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera PhotoRow* _tmp5_ = NULL; guint64 _tmp6_ = 0ULL; guint64 _tmp7_ = 0ULL; -#line 2097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; -#line 2097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = add; -#line 2097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = remove; -#line 2097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" flags = (_tmp2_ | _tmp3_) & (~_tmp4_); -#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->flags; -#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = flags; -#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != _tmp7_) { -#line 16337 "Photo.c" +#line 16352 "Photo.c" PhotoTable* _tmp8_ = NULL; PhotoTable* _tmp9_ = NULL; PhotoID _tmp10_ = {0}; guint64 _tmp11_ = 0ULL; gboolean _tmp12_ = FALSE; gboolean _tmp13_ = FALSE; -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_table_get_instance (); -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp10_); -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = flags; -#line 2099 "/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 2099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp12_; -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp9_); -#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = committed; -#line 2100 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2102 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 16362 "Photo.c" +#line 16377 "Photo.c" PhotoRow* _tmp14_ = NULL; guint64 _tmp15_ = 0ULL; -#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = flags; -#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->flags = _tmp15_; -#line 16371 "Photo.c" +#line 16386 "Photo.c" } } } - __finally329: + __finally330: { PhotoRow* _tmp16_ = NULL; -#line 2096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->row; -#line 2096 "/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 16382 "Photo.c" +#line 16397 "Photo.c" } -#line 2096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2096 "/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 2096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2098 "/home/jens/Source/shotwell/src/Photo.vala" return 0ULL; -#line 16392 "Photo.c" +#line 16407 "Photo.c" } } -#line 2105 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2107 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = committed; -#line 2105 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2107 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_) { -#line 16399 "Photo.c" +#line 16414 "Photo.c" Alteration* _tmp18_ = NULL; -#line 2106 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2108 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = additional_alteration; -#line 2106 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2108 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_flags_altered (self, _tmp18_); -#line 16405 "Photo.c" +#line 16420 "Photo.c" } -#line 2108 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2110 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; -#line 2108 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2110 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16411 "Photo.c" +#line 16426 "Photo.c" } @@ -16417,34 +16432,34 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati GeeCollection* _tmp0_ = NULL; GeeCollection* _tmp10_ = NULL; GError * _inner_error_ = NULL; -#line 2111 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2113 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((add == NULL) || GEE_IS_COLLECTION (add)); -#line 2111 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2113 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((additional_add_alteration == NULL) || IS_ALTERATION (additional_add_alteration)); -#line 2111 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2113 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((remove == NULL) || GEE_IS_COLLECTION (remove)); -#line 2111 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2113 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((additional_remove_alteration == NULL) || IS_ALTERATION (additional_remove_alteration)); -#line 2114 "/home/jens/Source/shotwell/src/Photo.vala" - database_table_begin_transaction (); #line 2116 "/home/jens/Source/shotwell/src/Photo.vala" + database_table_begin_transaction (); +#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = add; -#line 2116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 16433 "Photo.c" +#line 16448 "Photo.c" { GeeIterator* _photo_it = NULL; GeeCollection* _tmp1_ = NULL; GeeIterator* _tmp2_ = NULL; -#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = add; -#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _photo_it = _tmp2_; -#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 16446 "Photo.c" +#line 16461 "Photo.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; Photo* photo = NULL; @@ -16453,57 +16468,57 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati Photo* _tmp7_ = NULL; guint64 _tmp8_ = 0ULL; Alteration* _tmp9_ = NULL; -#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _photo_it; -#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp4_) { -#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 16463 "Photo.c" +#line 16478 "Photo.c" } -#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _photo_it; -#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" photo = (Photo*) _tmp6_; -#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo; -#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = add_mask; -#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = additional_add_alteration; -#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" photo_add_flags (_tmp7_, _tmp8_, _tmp9_); -#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 16481 "Photo.c" +#line 16496 "Photo.c" } -#line 2117 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2119 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 16485 "Photo.c" +#line 16500 "Photo.c" } } -#line 2121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2123 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = remove; -#line 2121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2123 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_ != NULL) { -#line 16492 "Photo.c" +#line 16507 "Photo.c" { GeeIterator* _photo_it = NULL; GeeCollection* _tmp11_ = NULL; GeeIterator* _tmp12_ = NULL; -#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = remove; -#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" _photo_it = _tmp12_; -#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 16505 "Photo.c" +#line 16520 "Photo.c" GeeIterator* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; Photo* photo = NULL; @@ -16512,58 +16527,58 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati Photo* _tmp17_ = NULL; guint64 _tmp18_ = 0ULL; Alteration* _tmp19_ = NULL; -#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _photo_it; -#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = gee_iterator_next (_tmp13_); -#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp14_) { -#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 16522 "Photo.c" +#line 16537 "Photo.c" } -#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _photo_it; -#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = gee_iterator_get (_tmp15_); -#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" photo = (Photo*) _tmp16_; -#line 2123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2125 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo; -#line 2123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2125 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = remove_mask; -#line 2123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2125 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = additional_remove_alteration; -#line 2123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2125 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (_tmp17_, _tmp18_, _tmp19_); -#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 16540 "Photo.c" +#line 16555 "Photo.c" } -#line 2122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2124 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 16544 "Photo.c" +#line 16559 "Photo.c" } } -#line 2126 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" database_table_commit_transaction (&_inner_error_); -#line 2126 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2126 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 2126 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2126 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16557 "Photo.c" +#line 16572 "Photo.c" } else { -#line 2126 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2128 "/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 2126 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2126 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2128 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16565 "Photo.c" +#line 16580 "Photo.c" } } } @@ -16575,22 +16590,22 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al gboolean committed = FALSE; gboolean _tmp16_ = FALSE; GError * _inner_error_ = NULL; -#line 2129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2131 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 2129 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2131 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL); -#line 2130 "/home/jens/Source/shotwell/src/Photo.vala" - flags = (guint64) 0; #line 2132 "/home/jens/Source/shotwell/src/Photo.vala" + flags = (guint64) 0; +#line 2134 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16585 "Photo.c" +#line 16600 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16592 "Photo.c" +#line 16607 "Photo.c" { PhotoRow* _tmp1_ = NULL; guint64 _tmp2_ = 0ULL; @@ -16598,151 +16613,151 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al PhotoRow* _tmp4_ = NULL; guint64 _tmp5_ = 0ULL; guint64 _tmp6_ = 0ULL; -#line 2134 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2134 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; -#line 2134 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = mask; -#line 2134 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" flags = _tmp2_ ^ _tmp3_; -#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->flags; -#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = flags; -#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ != _tmp6_) { -#line 16616 "Photo.c" +#line 16631 "Photo.c" PhotoTable* _tmp7_ = NULL; PhotoTable* _tmp8_ = NULL; PhotoID _tmp9_ = {0}; guint64 _tmp10_ = 0ULL; gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; -#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_table_get_instance (); -#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp9_); -#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = flags; -#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_table_replace_flags (_tmp8_, &_tmp9_, _tmp10_); -#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp11_; -#line 2136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp8_); -#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2139 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = committed; -#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2139 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 16641 "Photo.c" +#line 16656 "Photo.c" PhotoRow* _tmp13_ = NULL; guint64 _tmp14_ = 0ULL; -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2140 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->row; -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2140 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = flags; -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2140 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_->flags = _tmp14_; -#line 16650 "Photo.c" +#line 16665 "Photo.c" } } } - __finally330: + __finally331: { PhotoRow* _tmp15_ = NULL; -#line 2133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 2133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16661 "Photo.c" +#line 16676 "Photo.c" } -#line 2133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2135 "/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 2133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2135 "/home/jens/Source/shotwell/src/Photo.vala" return 0ULL; -#line 16671 "Photo.c" +#line 16686 "Photo.c" } } -#line 2142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2144 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = committed; -#line 2142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2144 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_) { -#line 16678 "Photo.c" +#line 16693 "Photo.c" Alteration* _tmp17_ = NULL; -#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2145 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = additional_alteration; -#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2145 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_flags_altered (self, _tmp17_); -#line 16684 "Photo.c" +#line 16699 "Photo.c" } -#line 2145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2147 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; -#line 2145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2147 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16690 "Photo.c" +#line 16705 "Photo.c" } gboolean photo_is_master_metadata_dirty (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 2148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2150 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 16699 "Photo.c" +#line 16714 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16706 "Photo.c" +#line 16721 "Photo.c" { PhotoRow* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 2150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2152 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2152 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->metadata_dirty; -#line 2150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2152 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 16716 "Photo.c" +#line 16731 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 2149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16723 "Photo.c" +#line 16738 "Photo.c" } -#line 2150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2152 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16727 "Photo.c" +#line 16742 "Photo.c" } - __finally331: + __finally332: { PhotoRow* _tmp4_ = NULL; -#line 2149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16736 "Photo.c" +#line 16751 "Photo.c" } -#line 2149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2151 "/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 2149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2151 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 16744 "Photo.c" +#line 16759 "Photo.c" } } @@ -16751,110 +16766,110 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro gboolean committed = FALSE; gboolean _tmp11_ = FALSE; GError * _inner_error_ = NULL; -#line 2154 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2155 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16757 "Photo.c" +#line 16772 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16764 "Photo.c" +#line 16779 "Photo.c" { PhotoRow* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->metadata_dirty; -#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = dirty; -#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != _tmp3_) { -#line 16777 "Photo.c" +#line 16792 "Photo.c" PhotoTable* _tmp4_ = NULL; PhotoTable* _tmp5_ = NULL; PhotoID _tmp6_ = {0}; gboolean _tmp7_ = FALSE; PhotoRow* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_table_get_instance (); -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp6_); -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = dirty; -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_set_metadata_dirty (_tmp5_, &_tmp6_, _tmp7_, &_inner_error_); -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp5_); -#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16798 "Photo.c" - goto __finally332; +#line 16813 "Photo.c" + goto __finally333; } -#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2161 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; -#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2161 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = dirty; -#line 2159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2161 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_->metadata_dirty = _tmp9_; -#line 2160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2162 "/home/jens/Source/shotwell/src/Photo.vala" committed = TRUE; -#line 16809 "Photo.c" +#line 16824 "Photo.c" } } - __finally332: + __finally333: { PhotoRow* _tmp10_ = NULL; -#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->row; -#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16819 "Photo.c" +#line 16834 "Photo.c" } -#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16829 "Photo.c" +#line 16844 "Photo.c" } else { -#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2158 "/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 2156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2158 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16837 "Photo.c" +#line 16852 "Photo.c" } } } -#line 2164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = committed; -#line 2164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2166 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 16845 "Photo.c" +#line 16860 "Photo.c" Alteration* _tmp12_ = NULL; Alteration* _tmp13_ = NULL; -#line 2165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = alteration_new ("metadata", "master-dirty"); -#line 2165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 2165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2167 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_); -#line 2165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2167 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp13_); -#line 16856 "Photo.c" +#line 16871 "Photo.c" } } @@ -16863,54 +16878,54 @@ static Rating photo_real_get_rating (MediaSource* base) { Photo * self; Rating result = 0; GError * _inner_error_ = NULL; -#line 2168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 16867 "Photo.c" +#line 16882 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16874 "Photo.c" +#line 16889 "Photo.c" { PhotoRow* _tmp1_ = NULL; Rating _tmp2_ = 0; -#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2172 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2172 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->rating; -#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2172 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 16884 "Photo.c" +#line 16899 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 2169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16891 "Photo.c" +#line 16906 "Photo.c" } -#line 2170 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2172 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16895 "Photo.c" +#line 16910 "Photo.c" } - __finally333: + __finally334: { PhotoRow* _tmp4_ = NULL; -#line 2169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16904 "Photo.c" +#line 16919 "Photo.c" } -#line 2169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2171 "/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 2169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2171 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 16912 "Photo.c" +#line 16927 "Photo.c" } } @@ -16920,122 +16935,122 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) { gboolean committed = FALSE; gboolean _tmp16_ = FALSE; GError * _inner_error_ = NULL; -#line 2174 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2176 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16926 "Photo.c" +#line 16941 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16933 "Photo.c" +#line 16948 "Photo.c" { gboolean _tmp1_ = FALSE; Rating _tmp2_ = 0; PhotoRow* _tmp3_ = NULL; Rating _tmp4_ = 0; -#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = rating; -#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->rating; -#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != _tmp4_) { -#line 16947 "Photo.c" +#line 16962 "Photo.c" Rating _tmp5_ = 0; gboolean _tmp6_ = FALSE; -#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = rating; -#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = rating_is_valid (_tmp5_); -#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp6_; -#line 16956 "Photo.c" +#line 16971 "Photo.c" } else { -#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 16960 "Photo.c" +#line 16975 "Photo.c" } -#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 16964 "Photo.c" +#line 16979 "Photo.c" PhotoTable* _tmp7_ = NULL; PhotoTable* _tmp8_ = NULL; PhotoID _tmp9_ = {0}; Rating _tmp10_ = 0; gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_table_get_instance (); -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp9_); -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = rating; -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_table_set_rating (_tmp8_, &_tmp9_, _tmp10_); -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp11_; -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp8_); -#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2182 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = committed; -#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2182 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 16989 "Photo.c" +#line 17004 "Photo.c" PhotoRow* _tmp13_ = NULL; Rating _tmp14_ = 0; -#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->row; -#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = rating; -#line 2181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_->rating = _tmp14_; -#line 16998 "Photo.c" +#line 17013 "Photo.c" } } } - __finally334: + __finally335: { PhotoRow* _tmp15_ = NULL; -#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17009 "Photo.c" +#line 17024 "Photo.c" } -#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/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 2177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17019 "Photo.c" +#line 17034 "Photo.c" } } -#line 2185 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2187 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = committed; -#line 2185 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2187 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_) { -#line 17026 "Photo.c" +#line 17041 "Photo.c" Alteration* _tmp17_ = NULL; Alteration* _tmp18_ = NULL; -#line 2186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2188 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = alteration_new ("metadata", "rating"); -#line 2186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2188 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_; -#line 2186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2188 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_); -#line 2186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2188 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp18_); -#line 17037 "Photo.c" +#line 17052 "Photo.c" } } @@ -17043,48 +17058,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 2189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2191 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17047 "Photo.c" +#line 17062 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17054 "Photo.c" +#line 17069 "Photo.c" { PhotoRow* _tmp1_ = NULL; Rating _tmp2_ = 0; Rating _tmp3_ = 0; -#line 2191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2193 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2193 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->rating; -#line 2191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2193 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = rating_increase (_tmp2_); -#line 2191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2193 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_); -#line 17067 "Photo.c" +#line 17082 "Photo.c" } - __finally335: + __finally336: { PhotoRow* _tmp4_ = NULL; -#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17076 "Photo.c" +#line 17091 "Photo.c" } -#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2192 "/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 2190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2190 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2192 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17086 "Photo.c" +#line 17101 "Photo.c" } } } @@ -17093,48 +17108,48 @@ static void photo_real_increase_rating (MediaSource* base) { static void photo_real_decrease_rating (MediaSource* base) { Photo * self; GError * _inner_error_ = NULL; -#line 2195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2197 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17097 "Photo.c" +#line 17112 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2196 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2196 "/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 17104 "Photo.c" +#line 17119 "Photo.c" { PhotoRow* _tmp1_ = NULL; Rating _tmp2_ = 0; Rating _tmp3_ = 0; -#line 2197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->rating; -#line 2197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = rating_decrease (_tmp2_); -#line 2197 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_); -#line 17117 "Photo.c" +#line 17132 "Photo.c" } - __finally336: + __finally337: { PhotoRow* _tmp4_ = NULL; -#line 2196 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2196 "/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 17126 "Photo.c" +#line 17141 "Photo.c" } -#line 2196 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2196 "/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 2196 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2196 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2198 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17136 "Photo.c" +#line 17151 "Photo.c" } } } @@ -17143,130 +17158,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 2201 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2203 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2201 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2203 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources)); -#line 17149 "Photo.c" +#line 17164 "Photo.c" { PhotoTable* _tmp0_ = NULL; PhotoTable* _tmp1_ = NULL; PhotoID _tmp2_ = {0}; const gchar* _tmp3_ = NULL; -#line 2206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); -#line 2206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 2206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp2_); -#line 2206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = backlinks; -#line 2206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_); -#line 2206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); -#line 2206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 17171 "Photo.c" - goto __catch337_database_error; +#line 17186 "Photo.c" + goto __catch338_database_error; } -#line 2206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2208 "/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 2206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17180 "Photo.c" +#line 17195 "Photo.c" } { PhotoRow* _tmp4_ = NULL; -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17188 "Photo.c" +#line 17203 "Photo.c" { PhotoRow* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = backlinks; -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = g_strdup (_tmp6_); -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2210 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp5_->backlinks); -#line 2208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_->backlinks = _tmp7_; -#line 17203 "Photo.c" +#line 17218 "Photo.c" } - __finally338: + __finally339: { PhotoRow* _tmp8_ = NULL; -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17212 "Photo.c" +#line 17227 "Photo.c" } -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 17218 "Photo.c" - goto __catch337_database_error; +#line 17233 "Photo.c" + goto __catch338_database_error; } -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2209 "/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 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2209 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17227 "Photo.c" +#line 17242 "Photo.c" } } } - goto __finally337; - __catch337_database_error: + goto __finally338; + __catch338_database_error: { GError* err = NULL; gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; GError* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; -#line 2205 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 2205 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 2211 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2213 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 2211 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2213 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_; -#line 2211 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2213 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = err; -#line 2211 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2213 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->message; -#line 2211 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2211: Unable to update link state for %s: %s", _tmp10_, _tmp12_); -#line 2211 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp10_); -#line 2205 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17257 "Photo.c" +#line 17272 "Photo.c" } - __finally337: -#line 2205 "/home/jens/Source/shotwell/src/Photo.vala" + __finally338: +#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2205 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2207 "/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 2205 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2205 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2207 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17268 "Photo.c" +#line 17283 "Photo.c" } } @@ -17275,18 +17290,18 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { Photo * self; gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 2219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2221 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2221 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (event_id != NULL, FALSE); -#line 17281 "Photo.c" +#line 17296 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17288 "Photo.c" +#line 17303 "Photo.c" { gboolean committed = FALSE; PhotoTable* _tmp1_ = NULL; @@ -17297,70 +17312,70 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; -#line 2221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 2221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->photo_id; -#line 2221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = *event_id; -#line 2221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_table_set_event (_tmp2_, &_tmp4_, &_tmp5_); -#line 2221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 2221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 2221 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp7_; #line 2223 "/home/jens/Source/shotwell/src/Photo.vala" + committed = _tmp7_; +#line 2225 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = committed; -#line 2223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2225 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 17321 "Photo.c" +#line 17336 "Photo.c" PhotoRow* _tmp9_ = NULL; EventID _tmp10_ = {0}; -#line 2224 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2224 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = *event_id; -#line 2224 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_->event_id = _tmp10_; -#line 17330 "Photo.c" +#line 17345 "Photo.c" } -#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2228 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; -#line 17334 "Photo.c" +#line 17349 "Photo.c" { PhotoRow* _tmp11_ = NULL; -#line 2220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17341 "Photo.c" +#line 17356 "Photo.c" } -#line 2226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2228 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17345 "Photo.c" +#line 17360 "Photo.c" } - __finally339: + __finally340: { PhotoRow* _tmp12_ = NULL; -#line 2220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->row; -#line 2220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17354 "Photo.c" +#line 17369 "Photo.c" } -#line 2220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2222 "/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 2220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2222 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 17362 "Photo.c" +#line 17377 "Photo.c" } } @@ -17380,13 +17395,13 @@ static gchar* photo_real_to_string (DataObject* base) { gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; gchar* _tmp19_ = NULL; -#line 2230 "/home/jens/Source/shotwell/src/Photo.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2232 "/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" _tmp1_ = photo_is_master_baseline (self); -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp1_) { -#line 17388 "Photo.c" +#line 17403 "Photo.c" GFile* _tmp2_ = NULL; GFile* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -17394,74 +17409,74 @@ static gchar* photo_real_to_string (DataObject* base) { gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_get_actual_file (self); -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = g_file_get_path (_tmp3_); -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = g_strconcat (" (", _tmp5_, NULL); -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_strconcat (_tmp7_, ")", NULL); -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp8_; -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp7_); -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp5_); -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 17420 "Photo.c" +#line 17435 "Photo.c" } else { gchar* _tmp9_ = NULL; -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = g_strdup (""); -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 2232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2234 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp9_; -#line 17429 "Photo.c" +#line 17444 "Photo.c" } -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp10_); -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_.id; -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp11_); -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo_get_master_reader (self); -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_; -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/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 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = g_strdup_printf ("[%s] %s%s", _tmp13_, _tmp17_, _tmp0_); -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_; -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp17_); -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp15_); -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp13_); -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp19_; -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 2231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2233 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17463 "Photo.c" +#line 17478 "Photo.c" } @@ -17474,21 +17489,21 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) { Photo* _tmp2_ = NULL; DataSource* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 2235 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2237 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2235 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE); #line 2237 "/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" _tmp0_ = source; -#line 2237 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2239 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO) ? ((Photo*) _tmp0_) : NULL); -#line 2237 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2239 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp1_; -#line 2238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2240 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo; -#line 2238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2240 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 17490 "Photo.c" +#line 17505 "Photo.c" PhotoID photo_id = {0}; PhotoID _tmp3_ = {0}; PhotoID other_photo_id = {0}; @@ -17496,66 +17511,66 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) { PhotoID _tmp5_ = {0}; gboolean _tmp6_ = FALSE; Photo* _tmp7_ = NULL; -#line 2239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2241 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp3_); -#line 2239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2241 "/home/jens/Source/shotwell/src/Photo.vala" photo_id = _tmp3_; -#line 2240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo; -#line 2240 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (_tmp4_, &_tmp5_); -#line 2240 "/home/jens/Source/shotwell/src/Photo.vala" - other_photo_id = _tmp5_; #line 2242 "/home/jens/Source/shotwell/src/Photo.vala" + other_photo_id = _tmp5_; +#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo; -#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" if (self != _tmp7_) { -#line 17512 "Photo.c" +#line 17527 "Photo.c" PhotoID _tmp8_ = {0}; gint64 _tmp9_ = 0LL; -#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_id; -#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_.id; -#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp9_ != PHOTO_ID_INVALID; -#line 17521 "Photo.c" +#line 17536 "Photo.c" } else { -#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; -#line 17525 "Photo.c" +#line 17540 "Photo.c" } -#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2244 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 17529 "Photo.c" +#line 17544 "Photo.c" PhotoID _tmp10_ = {0}; gint64 _tmp11_ = 0LL; PhotoID _tmp12_ = {0}; gint64 _tmp13_ = 0LL; -#line 2243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2245 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_id; -#line 2243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2245 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_.id; -#line 2243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2245 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = other_photo_id; -#line 2243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2245 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_.id; -#line 2243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2245 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp11_ != _tmp13_, "photo_id.id != other_photo_id.id"); -#line 17544 "Photo.c" +#line 17559 "Photo.c" } } -#line 2247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = source; -#line 2247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2249 "/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 2247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2249 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp15_; -#line 2247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2249 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 2247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2249 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17557 "Photo.c" +#line 17572 "Photo.c" } @@ -17575,196 +17590,196 @@ static void photo_file_exif_updated (Photo* self) { gboolean success = FALSE; gboolean _tmp37_ = FALSE; GError * _inner_error_ = NULL; -#line 2251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2254 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - file = _tmp0_; #line 2254 "/home/jens/Source/shotwell/src/Photo.vala" + file = _tmp0_; +#line 2256 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 17585 "Photo.c" +#line 17600 "Photo.c" { GFileInfo* _tmp1_ = NULL; GFileInfo* _tmp2_ = NULL; GFileInfo* _tmp3_ = NULL; -#line 2256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2258 "/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 2256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp2_; -#line 2256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17596 "Photo.c" - goto __catch340_g_error; +#line 17611 "Photo.c" + goto __catch341_g_error; } -#line 2256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp1_; -#line 2256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 2256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 2256 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" info = _tmp3_; -#line 2255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 17609 "Photo.c" +#line 17624 "Photo.c" } - goto __finally340; - __catch340_g_error: + goto __finally341; + __catch341_g_error: { GError* err = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; -#line 2255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 2255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 2259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 2259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 2259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = err->message; -#line 2259 "/home/jens/Source/shotwell/src/Photo.vala" - g_error ("Photo.vala:2259: Unable to read file information for %s: %s", _tmp5_, _tmp6_); -#line 2259 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp5_); -#line 2255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17634 "Photo.c" +#line 17649 "Photo.c" } - __finally340: -#line 2255 "/home/jens/Source/shotwell/src/Photo.vala" + __finally341: +#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 2255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 2255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2257 "/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 2255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2257 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17649 "Photo.c" +#line 17664 "Photo.c" } -#line 2262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = info; -#line 2262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2264 "/home/jens/Source/shotwell/src/Photo.vala" g_file_info_get_modification_time (_tmp7_, &_tmp8_); -#line 2262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2264 "/home/jens/Source/shotwell/src/Photo.vala" timestamp = _tmp8_; -#line 2265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2267 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_file_interrogator_new (file, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL); -#line 2265 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2267 "/home/jens/Source/shotwell/src/Photo.vala" interrogator = _tmp9_; -#line 17661 "Photo.c" +#line 17676 "Photo.c" { -#line 2267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2269 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (interrogator, &_inner_error_); -#line 2267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2269 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17667 "Photo.c" - goto __catch341_g_error; +#line 17682 "Photo.c" + goto __catch342_g_error; } } - goto __finally341; - __catch341_g_error: + goto __finally342; + __catch342_g_error: { GError* err = NULL; gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; GError* _tmp12_ = NULL; const gchar* _tmp13_ = NULL; -#line 2266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 2266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 2269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = g_file_get_path (file); -#line 2269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 2269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = err; -#line 2269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_->message; -#line 2269 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2269: Unable to interrogate photo file %s: %s", _tmp11_, _tmp13_); -#line 2269 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp11_); -#line 2266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17697 "Photo.c" +#line 17712 "Photo.c" } - __finally341: -#line 2266 "/home/jens/Source/shotwell/src/Photo.vala" + __finally342: +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 2266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 2266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 2266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/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 2266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17714 "Photo.c" +#line 17729 "Photo.c" } -#line 2272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo_file_interrogator_get_detected_photo_information (interrogator); -#line 2272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2274 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp14_; -#line 2273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = detected; -#line 2273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2275 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_ == NULL) { -#line 2273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = TRUE; -#line 17726 "Photo.c" +#line 17741 "Photo.c" } else { gboolean _tmp17_ = FALSE; -#line 2273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_file_interrogator_get_is_photo_corrupted (interrogator); -#line 2273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp17_; -#line 17733 "Photo.c" +#line 17748 "Photo.c" } -#line 2273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2275 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 17737 "Photo.c" +#line 17752 "Photo.c" gchar* _tmp18_ = NULL; gchar* _tmp19_ = NULL; -#line 2274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 2274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_; -#line 2274 "/home/jens/Source/shotwell/src/Photo.vala" - g_critical ("Photo.vala:2274: file_exif_updated: %s no longer an image", _tmp19_); -#line 2274 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp19_); #line 2276 "/home/jens/Source/shotwell/src/Photo.vala" - _detected_photo_information_unref0 (detected); + g_critical ("Photo.vala:2276: file_exif_updated: %s no longer an image", _tmp19_); #line 2276 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp19_); +#line 2278 "/home/jens/Source/shotwell/src/Photo.vala" + _detected_photo_information_unref0 (detected); +#line 2278 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2278 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2278 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 2276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2278 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17758 "Photo.c" +#line 17773 "Photo.c" } { PhotoRow* _tmp20_ = NULL; -#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->row; -#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17766 "Photo.c" +#line 17781 "Photo.c" { PhotoTable* _tmp21_ = NULL; PhotoTable* _tmp22_ = NULL; @@ -17781,96 +17796,96 @@ static void photo_file_exif_updated (Photo* self) { const gchar* _tmp33_ = NULL; PhotoRow* _tmp34_ = NULL; gboolean _tmp35_ = FALSE; -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_table_get_instance (); -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_; -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp23_); -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = info; -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = g_file_info_get_size (_tmp24_); -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = timestamp; -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_.tv_sec; -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = detected; -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp28_->md5; -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = detected; -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_->exif_md5; -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = detected; -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_->thumbnail_md5; -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = self->row; -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_table_master_exif_updated (_tmp22_, &_tmp23_, _tmp25_, _tmp27_, _tmp29_, _tmp31_, _tmp33_, _tmp34_); -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" success = _tmp35_; -#line 2281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp22_); -#line 17817 "Photo.c" +#line 17832 "Photo.c" } - __finally342: + __finally343: { PhotoRow* _tmp36_ = NULL; -#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = self->row; -#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17826 "Photo.c" +#line 17841 "Photo.c" } -#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2282 "/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 2280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2282 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17844 "Photo.c" +#line 17859 "Photo.c" } } -#line 2285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = success; -#line 2285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2287 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp37_) { -#line 17851 "Photo.c" +#line 17866 "Photo.c" Alteration* _tmp38_ = NULL; Alteration* _tmp39_ = NULL; -#line 2286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = alteration_new_from_list ("metadata:exif,metadata:md5"); -#line 2286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp38_; -#line 2286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2288 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_); -#line 2286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2288 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp39_); -#line 17862 "Photo.c" +#line 17877 "Photo.c" } -#line 2251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 2251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); -#line 2251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 2251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 17872 "Photo.c" +#line 17887 "Photo.c" } @@ -17878,54 +17893,54 @@ static guint64 photo_real_get_filesize (MediaSource* base) { Photo * self; guint64 result = 0ULL; GError * _inner_error_ = NULL; -#line 2291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2293 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17882 "Photo.c" +#line 17897 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17889 "Photo.c" +#line 17904 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; gint64 _tmp2_ = 0LL; -#line 2293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->backing_photo_row; -#line 2293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->filesize; -#line 2293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2295 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp2_; -#line 17899 "Photo.c" +#line 17914 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 2292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17906 "Photo.c" +#line 17921 "Photo.c" } -#line 2293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2295 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17910 "Photo.c" +#line 17925 "Photo.c" } - __finally343: + __finally344: { PhotoRow* _tmp4_ = NULL; -#line 2292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17919 "Photo.c" +#line 17934 "Photo.c" } -#line 2292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/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 2292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" return 0ULL; -#line 17927 "Photo.c" +#line 17942 "Photo.c" } } @@ -17934,57 +17949,57 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { Photo * self; guint64 result = 0ULL; GError * _inner_error_ = NULL; -#line 2297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2299 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17938 "Photo.c" +#line 17953 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17945 "Photo.c" +#line 17960 "Photo.c" { PhotoRow* _tmp1_ = NULL; BackingPhotoRow* _tmp2_ = NULL; gint64 _tmp3_ = 0LL; -#line 2299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; -#line 2299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->filesize; -#line 2299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp3_; -#line 17958 "Photo.c" +#line 17973 "Photo.c" { PhotoRow* _tmp4_ = NULL; -#line 2298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17965 "Photo.c" +#line 17980 "Photo.c" } -#line 2299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2301 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17969 "Photo.c" +#line 17984 "Photo.c" } - __finally344: + __finally345: { PhotoRow* _tmp5_ = NULL; -#line 2298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17978 "Photo.c" +#line 17993 "Photo.c" } -#line 2298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2300 "/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 2298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2298 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2300 "/home/jens/Source/shotwell/src/Photo.vala" return 0ULL; -#line 17986 "Photo.c" +#line 18001 "Photo.c" } } @@ -17992,54 +18007,54 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { guint64 photo_get_editable_filesize (Photo* self) { guint64 result = 0ULL; GError * _inner_error_ = NULL; -#line 2303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2305 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 17996 "Photo.c" +#line 18011 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18003 "Photo.c" +#line 18018 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; gint64 _tmp2_ = 0LL; -#line 2305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->editable; -#line 2305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->filesize; -#line 2305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2307 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp2_; -#line 18013 "Photo.c" +#line 18028 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 2304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18020 "Photo.c" +#line 18035 "Photo.c" } -#line 2305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2307 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18024 "Photo.c" +#line 18039 "Photo.c" } - __finally345: + __finally346: { PhotoRow* _tmp4_ = NULL; -#line 2304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18033 "Photo.c" +#line 18048 "Photo.c" } -#line 2304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2306 "/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 2304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2304 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2306 "/home/jens/Source/shotwell/src/Photo.vala" return 0ULL; -#line 18041 "Photo.c" +#line 18056 "Photo.c" } } @@ -18048,15 +18063,15 @@ static time_t photo_real_get_exposure_time (Dateable* base) { Photo * self; time_t result = 0; time_t _tmp0_ = 0; -#line 2309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2311 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->cached_exposure_time; -#line 2310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2312 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 2310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2312 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18058 "Photo.c" +#line 18073 "Photo.c" } @@ -18064,54 +18079,54 @@ static gchar* photo_real_get_basename (MediaSource* base) { Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; -#line 2313 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2315 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18068 "Photo.c" +#line 18083 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18075 "Photo.c" +#line 18090 "Photo.c" { const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 2315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2317 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->file_title; -#line 2315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2317 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = g_strdup (_tmp1_); -#line 2315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2317 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 18085 "Photo.c" +#line 18100 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 2314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18092 "Photo.c" +#line 18107 "Photo.c" } -#line 2315 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2317 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18096 "Photo.c" +#line 18111 "Photo.c" } - __finally346: + __finally347: { PhotoRow* _tmp4_ = NULL; -#line 2314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18105 "Photo.c" +#line 18120 "Photo.c" } -#line 2314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2316 "/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 2314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2316 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18113 "Photo.c" +#line 18128 "Photo.c" } } @@ -18120,57 +18135,57 @@ static gchar* photo_real_get_title (MediaSource* base) { Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; -#line 2319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2321 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18124 "Photo.c" +#line 18139 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18131 "Photo.c" +#line 18146 "Photo.c" { PhotoRow* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 2321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->title; -#line 2321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = g_strdup (_tmp2_); -#line 2321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2323 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 18144 "Photo.c" +#line 18159 "Photo.c" { PhotoRow* _tmp4_ = NULL; -#line 2320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18151 "Photo.c" +#line 18166 "Photo.c" } -#line 2321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2323 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18155 "Photo.c" +#line 18170 "Photo.c" } - __finally347: + __finally348: { PhotoRow* _tmp5_ = NULL; -#line 2320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18164 "Photo.c" +#line 18179 "Photo.c" } -#line 2320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2322 "/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 2320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2322 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18172 "Photo.c" +#line 18187 "Photo.c" } } @@ -18179,57 +18194,57 @@ static gchar* photo_real_get_comment (MediaSource* base) { Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; -#line 2325 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2327 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18183 "Photo.c" +#line 18198 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18190 "Photo.c" +#line 18205 "Photo.c" { PhotoRow* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 2327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->comment; -#line 2327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = g_strdup (_tmp2_); -#line 2327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2329 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 18203 "Photo.c" +#line 18218 "Photo.c" { PhotoRow* _tmp4_ = NULL; -#line 2326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18210 "Photo.c" +#line 18225 "Photo.c" } -#line 2327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2329 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18214 "Photo.c" +#line 18229 "Photo.c" } - __finally348: + __finally349: { PhotoRow* _tmp5_ = NULL; -#line 2326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18223 "Photo.c" +#line 18238 "Photo.c" } -#line 2326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2328 "/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 2326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2328 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18231 "Photo.c" +#line 18246 "Photo.c" } } @@ -18242,24 +18257,24 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) { gboolean committed = FALSE; gboolean _tmp18_ = FALSE; GError * _inner_error_ = NULL; -#line 2331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2333 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2334 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = title; -#line 2332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2334 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_source_prep_title (_tmp0_); -#line 2332 "/home/jens/Source/shotwell/src/Photo.vala" - new_title = _tmp1_; #line 2334 "/home/jens/Source/shotwell/src/Photo.vala" + new_title = _tmp1_; +#line 2336 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 18254 "Photo.c" +#line 18269 "Photo.c" { PhotoRow* _tmp2_ = NULL; -#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18261 "Photo.c" +#line 18276 "Photo.c" { const gchar* _tmp3_ = NULL; PhotoRow* _tmp4_ = NULL; @@ -18271,108 +18286,108 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) { const gchar* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; gboolean _tmp13_ = FALSE; -#line 2336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = new_title; -#line 2336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->title; -#line 2336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2338 "/home/jens/Source/shotwell/src/Photo.vala" if (g_strcmp0 (_tmp3_, _tmp5_) == 0) { -#line 18281 "Photo.c" +#line 18296 "Photo.c" { PhotoRow* _tmp6_ = NULL; -#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18288 "Photo.c" +#line 18303 "Photo.c" } -#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2339 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_title); -#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2339 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18294 "Photo.c" +#line 18309 "Photo.c" } -#line 2339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_table_get_instance (); -#line 2339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 2339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->photo_id; -#line 2339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = new_title; -#line 2339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_table_set_title (_tmp8_, &_tmp10_, _tmp11_); -#line 2339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp12_; -#line 2339 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp8_); -#line 2340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = committed; -#line 2340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2342 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 18316 "Photo.c" +#line 18331 "Photo.c" PhotoRow* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; -#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2343 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2343 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = new_title; -#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2343 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = g_strdup (_tmp15_); -#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2343 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp14_->title); -#line 2341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2343 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->title = _tmp16_; -#line 18330 "Photo.c" +#line 18345 "Photo.c" } } - __finally349: + __finally350: { PhotoRow* _tmp17_ = NULL; -#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->row; -#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18340 "Photo.c" +#line 18355 "Photo.c" } -#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_title); -#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2337 "/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 2335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2335 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2337 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18352 "Photo.c" +#line 18367 "Photo.c" } } -#line 2344 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2346 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = committed; -#line 2344 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2346 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_) { -#line 18359 "Photo.c" +#line 18374 "Photo.c" Alteration* _tmp19_ = NULL; Alteration* _tmp20_ = NULL; -#line 2345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = alteration_new ("metadata", "name"); -#line 2345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 2345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_); -#line 2345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2347 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp20_); -#line 18370 "Photo.c" +#line 18385 "Photo.c" } -#line 2331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2333 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_title); -#line 18374 "Photo.c" +#line 18389 "Photo.c" } @@ -18385,24 +18400,24 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) gboolean committed = FALSE; gboolean _tmp18_ = FALSE; GError * _inner_error_ = NULL; -#line 2348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2350 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 2349 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2351 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = comment; -#line 2349 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2351 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_source_prep_comment (_tmp0_); -#line 2349 "/home/jens/Source/shotwell/src/Photo.vala" - new_comment = _tmp1_; #line 2351 "/home/jens/Source/shotwell/src/Photo.vala" + new_comment = _tmp1_; +#line 2353 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 18397 "Photo.c" +#line 18412 "Photo.c" { PhotoRow* _tmp2_ = NULL; -#line 2352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 2352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18404 "Photo.c" +#line 18419 "Photo.c" { const gchar* _tmp3_ = NULL; PhotoRow* _tmp4_ = NULL; @@ -18414,121 +18429,121 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) const gchar* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; gboolean _tmp13_ = FALSE; -#line 2353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = new_comment; -#line 2353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->comment; -#line 2353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2355 "/home/jens/Source/shotwell/src/Photo.vala" if (g_strcmp0 (_tmp3_, _tmp5_) == 0) { -#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 18426 "Photo.c" +#line 18441 "Photo.c" { PhotoRow* _tmp6_ = NULL; -#line 2352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18433 "Photo.c" +#line 18448 "Photo.c" } -#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_comment); -#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18439 "Photo.c" +#line 18454 "Photo.c" } -#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_table_get_instance (); -#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->photo_id; -#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = new_comment; -#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_table_set_comment (_tmp8_, &_tmp10_, _tmp11_); -#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp12_; -#line 2356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp8_); -#line 2357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2359 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = committed; -#line 2357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2359 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 18461 "Photo.c" +#line 18476 "Photo.c" PhotoRow* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; -#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = new_comment; -#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = g_strdup (_tmp15_); -#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp14_->comment); -#line 2358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_->comment = _tmp16_; -#line 18475 "Photo.c" +#line 18490 "Photo.c" } } - __finally350: + __finally351: { PhotoRow* _tmp17_ = NULL; -#line 2352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->row; -#line 2352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18485 "Photo.c" +#line 18500 "Photo.c" } -#line 2352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_comment); -#line 2352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2354 "/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 2352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2354 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 18497 "Photo.c" +#line 18512 "Photo.c" } } -#line 2361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = committed; -#line 2361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2363 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_) { -#line 18504 "Photo.c" +#line 18519 "Photo.c" Alteration* _tmp19_ = NULL; Alteration* _tmp20_ = NULL; -#line 2362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = alteration_new ("metadata", "comment"); -#line 2362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 2362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2364 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_); -#line 2362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2364 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp20_); -#line 18515 "Photo.c" +#line 18530 "Photo.c" } -#line 2364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2366 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; -#line 2364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2366 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_comment); -#line 2364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2366 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18523 "Photo.c" +#line 18538 "Photo.c" } static gpointer _g_error_copy0 (gpointer self) { -#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2376 "/home/jens/Source/shotwell/src/Photo.vala" return self ? g_error_copy (self) : NULL; -#line 18530 "Photo.c" +#line 18545 "Photo.c" } @@ -18536,20 +18551,20 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { GError* dberr = NULL; GError* _tmp13_ = NULL; GError * _inner_error_ = NULL; -#line 2367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (import_id != NULL); -#line 2368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" dberr = NULL; -#line 18544 "Photo.c" +#line 18559 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18551 "Photo.c" +#line 18566 "Photo.c" { { PhotoTable* _tmp1_ = NULL; @@ -18559,158 +18574,158 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { ImportID _tmp5_ = {0}; PhotoRow* _tmp7_ = NULL; ImportID _tmp8_ = {0}; -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->photo_id; -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = *import_id; -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_set_import_id (_tmp2_, &_tmp4_, &_tmp5_, &_inner_error_); -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 18579 "Photo.c" - goto __catch352_database_error; +#line 18594 "Photo.c" + goto __catch353_database_error; } { PhotoRow* _tmp6_ = NULL; -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18588 "Photo.c" +#line 18603 "Photo.c" } -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/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 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2373 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18598 "Photo.c" +#line 18613 "Photo.c" } -#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = *import_id; -#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_->import_id = _tmp8_; -#line 18606 "Photo.c" +#line 18621 "Photo.c" } - goto __finally352; - __catch352_database_error: + goto __finally353; + __catch353_database_error: { GError* err = NULL; GError* _tmp9_ = NULL; GError* _tmp10_ = NULL; -#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2376 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = err; -#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2376 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _g_error_copy0 (_tmp9_); -#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2376 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); -#line 2374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2376 "/home/jens/Source/shotwell/src/Photo.vala" dberr = _tmp10_; -#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 18628 "Photo.c" +#line 18643 "Photo.c" } - __finally352: -#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" + __finally353: +#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18633 "Photo.c" +#line 18648 "Photo.c" { PhotoRow* _tmp11_ = NULL; -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18640 "Photo.c" +#line 18655 "Photo.c" } -#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); -#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2372 "/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 2370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2372 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18650 "Photo.c" +#line 18665 "Photo.c" } } - __finally351: + __finally352: { PhotoRow* _tmp12_ = NULL; -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->row; -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18660 "Photo.c" +#line 18675 "Photo.c" } -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2371 "/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 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2371 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18672 "Photo.c" +#line 18687 "Photo.c" } } -#line 2378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2380 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = dberr; -#line 2378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2380 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ == NULL) { -#line 18679 "Photo.c" +#line 18694 "Photo.c" Alteration* _tmp14_ = NULL; Alteration* _tmp15_ = NULL; -#line 2379 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = alteration_new ("metadata", "import-id"); -#line 2379 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_; -#line 2379 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_); -#line 2379 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp15_); -#line 18690 "Photo.c" +#line 18705 "Photo.c" } else { gchar* _tmp16_ = NULL; gchar* _tmp17_ = NULL; GError* _tmp18_ = NULL; const gchar* _tmp19_ = NULL; -#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = dberr; -#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->message; -#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2381: Unable to write import ID for %s: %s", _tmp17_, _tmp19_); -#line 2381 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp17_); -#line 18708 "Photo.c" +#line 18723 "Photo.c" } -#line 2367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2369 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); -#line 18712 "Photo.c" +#line 18727 "Photo.c" } @@ -18733,155 +18748,155 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error GFile* _tmp16_ = NULL; const gchar* _tmp22_ = NULL; GError * _inner_error_ = NULL; -#line 2384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2386 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2387 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_source_reader (self); -#line 2385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2387 "/home/jens/Source/shotwell/src/Photo.vala" source = _tmp0_; -#line 2388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = source; -#line 2388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/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 2388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2390 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 18749 "Photo.c" +#line 18764 "Photo.c" PhotoFileReader* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; -#line 2389 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = source; -#line 2389 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2391 "/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 2389 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2391 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 2389 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2389: No photo file writer available for %s", _tmp6_); -#line 2389 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp6_); #line 2391 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = title; + g_warning ("Photo.vala:2391: No photo file writer available for %s", _tmp6_); #line 2391 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_); + _g_free0 (_tmp6_); #line 2393 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (source); + _tmp7_ = title; #line 2393 "/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" + _photo_file_adapter_unref0 (source); +#line 2395 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18772 "Photo.c" +#line 18787 "Photo.c" } -#line 2396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = source; -#line 2396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_); -#line 2396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp9_; -#line 2396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2396 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2398 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18788 "Photo.c" +#line 18803 "Photo.c" } -#line 2397 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = metadata; -#line 2397 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = title; -#line 2397 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_title (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 2399 "/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" _tmp12_ = source; -#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_); -#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" writer = _tmp13_; -#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18812 "Photo.c" +#line 18827 "Photo.c" } -#line 2400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = source; -#line 2400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2402 "/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 2400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 2400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_title"); -#line 2400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp16_); -#line 18824 "Photo.c" +#line 18839 "Photo.c" { PhotoFileMetadataWriter* _tmp17_ = NULL; PhotoMetadata* _tmp18_ = NULL; -#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2404 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = writer; -#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2404 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = metadata; -#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2404 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_); -#line 2402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2404 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18836 "Photo.c" - goto __finally353; +#line 18851 "Photo.c" + goto __finally354; } } - __finally353: + __finally354: { PhotoFileReader* _tmp19_ = NULL; GFile* _tmp20_ = NULL; GFile* _tmp21_ = NULL; -#line 2404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2406 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = source; -#line 2404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2406 "/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 2404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2406 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_; -#line 2404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2406 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_unblacklist_file (_tmp21_); -#line 2404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2406 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp21_); -#line 18855 "Photo.c" +#line 18870 "Photo.c" } -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2403 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2403 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2403 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2403 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2403 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2403 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18869 "Photo.c" +#line 18884 "Photo.c" } -#line 2407 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2409 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = title; -#line 2407 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_); #line 2409 "/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" photo_file_exif_updated (self); -#line 2384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2386 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 2384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2386 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2386 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 18883 "Photo.c" +#line 18898 "Photo.c" } @@ -18904,155 +18919,155 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e GFile* _tmp16_ = NULL; const gchar* _tmp22_ = NULL; GError * _inner_error_ = NULL; -#line 2412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2414 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2413 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2415 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_source_reader (self); -#line 2413 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2415 "/home/jens/Source/shotwell/src/Photo.vala" source = _tmp0_; -#line 2416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2418 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = source; -#line 2416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2418 "/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 2416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2418 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2418 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 18920 "Photo.c" +#line 18935 "Photo.c" PhotoFileReader* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; -#line 2417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2419 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = source; -#line 2417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2419 "/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 2417 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2419 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 2417 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2417: No photo file writer available for %s", _tmp6_); -#line 2417 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp6_); #line 2419 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = comment; + g_warning ("Photo.vala:2419: No photo file writer available for %s", _tmp6_); #line 2419 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_); + _g_free0 (_tmp6_); #line 2421 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (source); + _tmp7_ = comment; #line 2421 "/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" + _photo_file_adapter_unref0 (source); +#line 2423 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18943 "Photo.c" +#line 18958 "Photo.c" } -#line 2424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = source; -#line 2424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_); -#line 2424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp9_; -#line 2424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2426 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18959 "Photo.c" +#line 18974 "Photo.c" } -#line 2425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2427 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = metadata; -#line 2425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2427 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = comment; -#line 2425 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_comment (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 2427 "/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" _tmp12_ = source; -#line 2427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_); -#line 2427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" writer = _tmp13_; -#line 2427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2427 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18983 "Photo.c" +#line 18998 "Photo.c" } -#line 2428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = source; -#line 2428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2430 "/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 2428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 2428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_comment"); -#line 2428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp16_); -#line 18995 "Photo.c" +#line 19010 "Photo.c" { PhotoFileMetadataWriter* _tmp17_ = NULL; PhotoMetadata* _tmp18_ = NULL; -#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2432 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = writer; -#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2432 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = metadata; -#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2432 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_); -#line 2430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2432 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 19007 "Photo.c" - goto __finally354; +#line 19022 "Photo.c" + goto __finally355; } } - __finally354: + __finally355: { PhotoFileReader* _tmp19_ = NULL; GFile* _tmp20_ = NULL; GFile* _tmp21_ = NULL; -#line 2432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2434 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = source; -#line 2432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2434 "/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 2432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2434 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_; -#line 2432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2434 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_unblacklist_file (_tmp21_); -#line 2432 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2434 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp21_); -#line 19026 "Photo.c" +#line 19041 "Photo.c" } -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2431 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2431 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2431 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2431 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2431 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2431 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19040 "Photo.c" +#line 19055 "Photo.c" } -#line 2435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = comment; -#line 2435 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_); #line 2437 "/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" photo_file_exif_updated (self); -#line 2412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2414 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 2412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2414 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2414 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 19054 "Photo.c" +#line 19069 "Photo.c" } @@ -19061,16 +19076,16 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { gboolean committed = FALSE; gboolean _tmp12_ = FALSE; GError * _inner_error_ = NULL; -#line 2440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2442 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 19065 "Photo.c" +#line 19080 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19072 "Photo.c" +#line 19087 "Photo.c" { PhotoTable* _tmp1_ = NULL; PhotoTable* _tmp2_ = NULL; @@ -19079,79 +19094,79 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { time_t _tmp5_ = 0; gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; -#line 2443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 2443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->photo_id; -#line 2443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = time; -#line 2443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_); -#line 2443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp6_; -#line 2443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2446 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = committed; -#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2446 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { -#line 19101 "Photo.c" +#line 19116 "Photo.c" PhotoRow* _tmp8_ = NULL; time_t _tmp9_ = 0; time_t _tmp10_ = 0; -#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2447 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; -#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2447 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = time; -#line 2445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2447 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_->exposure_time = _tmp9_; -#line 2446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2448 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = time; -#line 2446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2448 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->cached_exposure_time = _tmp10_; -#line 19115 "Photo.c" +#line 19130 "Photo.c" } } - __finally355: + __finally356: { PhotoRow* _tmp11_ = NULL; -#line 2442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19125 "Photo.c" +#line 19140 "Photo.c" } -#line 2442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2444 "/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 2442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2444 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19135 "Photo.c" +#line 19150 "Photo.c" } } -#line 2450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = committed; -#line 2450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2452 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 19142 "Photo.c" +#line 19157 "Photo.c" Alteration* _tmp13_ = NULL; Alteration* _tmp14_ = NULL; -#line 2451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2453 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = alteration_new ("metadata", "exposure-time"); -#line 2451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2453 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_; -#line 2451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2453 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_); -#line 2451 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2453 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp14_); -#line 19153 "Photo.c" +#line 19168 "Photo.c" } } @@ -19177,161 +19192,161 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro GFile* _tmp18_ = NULL; time_t _tmp24_ = 0; GError * _inner_error_ = NULL; -#line 2454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2456 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2457 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_source_reader (self); -#line 2455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2457 "/home/jens/Source/shotwell/src/Photo.vala" source = _tmp0_; -#line 2458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = source; -#line 2458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2460 "/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 2458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2460 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 19193 "Photo.c" +#line 19208 "Photo.c" PhotoFileReader* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; time_t _tmp7_ = 0; -#line 2459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = source; -#line 2459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2461 "/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 2459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 2459 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2459: No photo file writer available for %s", _tmp6_); -#line 2459 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp6_); #line 2461 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = time; + g_warning ("Photo.vala:2461: No photo file writer available for %s", _tmp6_); #line 2461 "/home/jens/Source/shotwell/src/Photo.vala" - dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp7_); + _g_free0 (_tmp6_); #line 2463 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (source); + _tmp7_ = time; #line 2463 "/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" + _photo_file_adapter_unref0 (source); +#line 2465 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19216 "Photo.c" +#line 19231 "Photo.c" } -#line 2466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = source; -#line 2466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_); -#line 2466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp9_; -#line 2466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2468 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19232 "Photo.c" +#line 19247 "Photo.c" } -#line 2467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = metadata; -#line 2467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = time; -#line 2467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = metadata_date_time_new (_tmp11_); -#line 2467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 2467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_exposure_date_time (_tmp10_, _tmp13_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 2467 "/home/jens/Source/shotwell/src/Photo.vala" - _metadata_date_time_unref0 (_tmp13_); #line 2469 "/home/jens/Source/shotwell/src/Photo.vala" + _metadata_date_time_unref0 (_tmp13_); +#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = source; -#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_file_reader_create_metadata_writer (_tmp14_, &_inner_error_); -#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" writer = _tmp15_; -#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19262 "Photo.c" +#line 19277 "Photo.c" } -#line 2470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = source; -#line 2470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2472 "/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 2470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_; -#line 2470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_blacklist_file (_tmp18_, "Photo.set_exposure_time_persistent"); -#line 2470 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp18_); -#line 19274 "Photo.c" +#line 19289 "Photo.c" { PhotoFileMetadataWriter* _tmp19_ = NULL; PhotoMetadata* _tmp20_ = NULL; -#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = writer; -#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = metadata; -#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2474 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp19_, _tmp20_, &_inner_error_); -#line 2472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2474 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 19286 "Photo.c" - goto __finally356; +#line 19301 "Photo.c" + goto __finally357; } } - __finally356: + __finally357: { PhotoFileReader* _tmp21_ = NULL; GFile* _tmp22_ = NULL; GFile* _tmp23_ = NULL; -#line 2474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2476 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = source; -#line 2474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2476 "/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 2474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2476 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_; -#line 2474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2476 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_unblacklist_file (_tmp23_); -#line 2474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2476 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp23_); -#line 19305 "Photo.c" +#line 19320 "Photo.c" } -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2473 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2473 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2473 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2473 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2473 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 2471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2473 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19319 "Photo.c" +#line 19334 "Photo.c" } -#line 2477 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = time; -#line 2477 "/home/jens/Source/shotwell/src/Photo.vala" - dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp24_); #line 2479 "/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" photo_file_exif_updated (self); -#line 2454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2456 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 2454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2456 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2456 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 19333 "Photo.c" +#line 19348 "Photo.c" } @@ -19358,39 +19373,39 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo gboolean _tmp11_ = FALSE; PhotoException _tmp22_ = 0; gboolean _tmp23_ = FALSE; -#line 2495 "/home/jens/Source/shotwell/src/Photo.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2497 "/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" photo_get_raw_dimensions (self, &_tmp0_); -#line 2497 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2499 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims = _tmp0_; -#line 2500 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = disallowed_steps; -#line 2500 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2502 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_exception_allows (_tmp1_, PHOTO_EXCEPTION_ORIENTATION); -#line 2500 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2502 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 19372 "Photo.c" +#line 19387 "Photo.c" Orientation ori_tmp = 0; Orientation _tmp3_ = 0; Orientation _tmp4_ = 0; -#line 2501 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2503 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_orientation (self); -#line 2501 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2503 "/home/jens/Source/shotwell/src/Photo.vala" ori_tmp = _tmp3_; -#line 2504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2506 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = ori_tmp; -#line 2504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2506 "/home/jens/Source/shotwell/src/Photo.vala" switch (_tmp4_) { -#line 2504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2506 "/home/jens/Source/shotwell/src/Photo.vala" case ORIENTATION_LEFT_TOP: -#line 2504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2506 "/home/jens/Source/shotwell/src/Photo.vala" case ORIENTATION_RIGHT_TOP: -#line 2504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2506 "/home/jens/Source/shotwell/src/Photo.vala" case ORIENTATION_LEFT_BOTTOM: -#line 2504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2506 "/home/jens/Source/shotwell/src/Photo.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 19392 "Photo.c" +#line 19407 "Photo.c" { gint width_tmp = 0; Dimensions _tmp5_ = {0}; @@ -19398,41 +19413,41 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo Dimensions _tmp7_ = {0}; gint _tmp8_ = 0; gint _tmp9_ = 0; -#line 2510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2512 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = returned_dims; -#line 2510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2512 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_.width; -#line 2510 "/home/jens/Source/shotwell/src/Photo.vala" - width_tmp = _tmp6_; #line 2512 "/home/jens/Source/shotwell/src/Photo.vala" + width_tmp = _tmp6_; +#line 2514 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = returned_dims; -#line 2512 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2514 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_.height; -#line 2512 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2514 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims.width = _tmp8_; -#line 2513 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2515 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = width_tmp; -#line 2513 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2515 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims.height = _tmp9_; -#line 2514 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2516 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 19418 "Photo.c" +#line 19433 "Photo.c" } default: { -#line 2518 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2520 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 19424 "Photo.c" +#line 19439 "Photo.c" } } } -#line 2523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2525 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = disallowed_steps; -#line 2523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2525 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_STRAIGHTEN); -#line 2523 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2525 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 19434 "Photo.c" +#line 19449 "Photo.c" gdouble x_size = 0.0; gdouble y_size = 0.0; gdouble angle = 0.0; @@ -19446,71 +19461,71 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo gdouble _tmp19_ = 0.0; gdouble _tmp20_ = 0.0; gdouble _tmp21_ = 0.0; -#line 2525 "/home/jens/Source/shotwell/src/Photo.vala" - angle = 0.0; #line 2527 "/home/jens/Source/shotwell/src/Photo.vala" + angle = 0.0; +#line 2529 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_straighten (self, &_tmp12_); -#line 2527 "/home/jens/Source/shotwell/src/Photo.vala" - angle = _tmp12_; #line 2529 "/home/jens/Source/shotwell/src/Photo.vala" + angle = _tmp12_; +#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = returned_dims; -#line 2529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_.width; -#line 2529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = returned_dims; -#line 2529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_.height; -#line 2529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = angle; -#line 2529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" compute_arb_rotated_size ((gdouble) _tmp14_, (gdouble) _tmp16_, _tmp17_, &_tmp18_, &_tmp19_); -#line 2529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" x_size = _tmp18_; -#line 2529 "/home/jens/Source/shotwell/src/Photo.vala" - y_size = _tmp19_; #line 2531 "/home/jens/Source/shotwell/src/Photo.vala" + y_size = _tmp19_; +#line 2533 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = x_size; -#line 2531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2533 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims.width = (gint) _tmp20_; -#line 2532 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2534 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = y_size; -#line 2532 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2534 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims.height = (gint) _tmp21_; -#line 19478 "Photo.c" +#line 19493 "Photo.c" } -#line 2536 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2538 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = disallowed_steps; -#line 2536 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2538 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo_exception_allows (_tmp22_, PHOTO_EXCEPTION_CROP); -#line 2536 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2538 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_) { -#line 19486 "Photo.c" +#line 19501 "Photo.c" Box crop = {0}; PhotoException _tmp24_ = 0; Box _tmp25_ = {0}; gboolean _tmp26_ = FALSE; -#line 2538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2540 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = disallowed_steps; -#line 2538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2540 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = photo_get_crop (self, &_tmp25_, _tmp24_); -#line 2538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2540 "/home/jens/Source/shotwell/src/Photo.vala" crop = _tmp25_; -#line 2538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2540 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp26_) { -#line 19499 "Photo.c" +#line 19514 "Photo.c" Dimensions _tmp27_ = {0}; -#line 2539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2541 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&crop, &_tmp27_); -#line 2539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2541 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims = _tmp27_; -#line 19505 "Photo.c" +#line 19520 "Photo.c" } } -#line 2542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2544 "/home/jens/Source/shotwell/src/Photo.vala" *result = returned_dims; -#line 2542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2544 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19512 "Photo.c" +#line 19527 "Photo.c" } @@ -19521,114 +19536,114 @@ static void photo_locked_create_adjustments_from_data (Photo* self) { KeyValueMap* _tmp2_ = NULL; PixelTransformationBundle* _tmp6_ = NULL; PixelTransformer* _tmp7_ = NULL; -#line 2546 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2548 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2547 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2549 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = pixel_transformation_bundle_new (); -#line 2547 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2549 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); -#line 2547 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->adjustments = _tmp0_; #line 2549 "/home/jens/Source/shotwell/src/Photo.vala" + self->priv->adjustments = _tmp0_; +#line 2551 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_transformation (self, "adjustments"); -#line 2549 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2551 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp1_; -#line 2550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map; -#line 2550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2552 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 19539 "Photo.c" +#line 19554 "Photo.c" PixelTransformationBundle* _tmp3_ = NULL; -#line 2551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->adjustments; -#line 2551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2553 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformation_bundle_set_to_identity (_tmp3_); -#line 19545 "Photo.c" +#line 19560 "Photo.c" } else { PixelTransformationBundle* _tmp4_ = NULL; KeyValueMap* _tmp5_ = NULL; -#line 2553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2555 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->adjustments; -#line 2553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2555 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = map; -#line 2553 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2555 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformation_bundle_load (_tmp4_, _tmp5_); -#line 19555 "Photo.c" +#line 19570 "Photo.c" } -#line 2555 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->adjustments; -#line 2555 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = pixel_transformation_bundle_generate_transformer (_tmp6_); -#line 2555 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); -#line 2555 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = _tmp7_; -#line 2546 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2548 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 19567 "Photo.c" +#line 19582 "Photo.c" } PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { PixelTransformationBundle* result = NULL; GError * _inner_error_ = NULL; -#line 2559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2561 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 19576 "Photo.c" +#line 19591 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19583 "Photo.c" +#line 19598 "Photo.c" { PixelTransformationBundle* _tmp1_ = NULL; PixelTransformationBundle* _tmp2_ = NULL; PixelTransformationBundle* _tmp3_ = NULL; -#line 2561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2563 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->adjustments; -#line 2561 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2563 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2564 "/home/jens/Source/shotwell/src/Photo.vala" photo_locked_create_adjustments_from_data (self); -#line 19594 "Photo.c" +#line 19609 "Photo.c" } -#line 2564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2566 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->adjustments; -#line 2564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2566 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = pixel_transformation_bundle_copy (_tmp2_); -#line 2564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2566 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 19602 "Photo.c" +#line 19617 "Photo.c" { PhotoRow* _tmp4_ = NULL; -#line 2560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19609 "Photo.c" +#line 19624 "Photo.c" } -#line 2564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2566 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19613 "Photo.c" +#line 19628 "Photo.c" } - __finally357: + __finally358: { PhotoRow* _tmp5_ = NULL; -#line 2560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19622 "Photo.c" +#line 19637 "Photo.c" } -#line 2560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2562 "/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 2560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2562 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 19630 "Photo.c" +#line 19645 "Photo.c" } } @@ -19636,63 +19651,63 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { PixelTransformer* photo_get_pixel_transformer (Photo* self) { PixelTransformer* result = NULL; GError * _inner_error_ = NULL; -#line 2568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2570 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 19640 "Photo.c" +#line 19655 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19647 "Photo.c" +#line 19662 "Photo.c" { PixelTransformer* _tmp1_ = NULL; PixelTransformer* _tmp2_ = NULL; PixelTransformer* _tmp3_ = NULL; -#line 2570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->transformer; -#line 2570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2572 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2573 "/home/jens/Source/shotwell/src/Photo.vala" photo_locked_create_adjustments_from_data (self); -#line 19658 "Photo.c" +#line 19673 "Photo.c" } -#line 2573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->transformer; -#line 2573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = pixel_transformer_copy (_tmp2_); -#line 2573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2575 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 19666 "Photo.c" +#line 19681 "Photo.c" { PhotoRow* _tmp4_ = NULL; -#line 2569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19673 "Photo.c" +#line 19688 "Photo.c" } -#line 2573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2575 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19677 "Photo.c" +#line 19692 "Photo.c" } - __finally358: + __finally359: { PhotoRow* _tmp5_ = NULL; -#line 2569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19686 "Photo.c" +#line 19701 "Photo.c" } -#line 2569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2571 "/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 2569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2571 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 19694 "Photo.c" +#line 19709 "Photo.c" } } @@ -19700,15 +19715,15 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { gboolean photo_has_color_adjustments (Photo* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 2577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2579 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_has_transformation (self, "adjustments"); -#line 2578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2580 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 2578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2580 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19710 "Photo.c" +#line 19725 "Photo.c" } @@ -19719,25 +19734,25 @@ PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformatio PixelTransformationType _tmp2_ = 0; PixelTransformation* _tmp3_ = NULL; PixelTransformation* _tmp4_ = NULL; -#line 2581 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2583 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 2582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_color_adjustments (self); -#line 2582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 2582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = type; -#line 2582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = pixel_transformation_bundle_get_transformation (_tmp1_, _tmp2_); -#line 2582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 2582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp1_); -#line 2582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 2582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2584 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19739 "Photo.c" +#line 19754 "Photo.c" } @@ -19750,141 +19765,141 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad gboolean committed = FALSE; gboolean _tmp39_ = FALSE; GError * _inner_error_ = NULL; -#line 2585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2587 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2587 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_adjustments)); -#line 2588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = new_adjustments; -#line 2588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = pixel_transformation_bundle_is_identity (_tmp0_); -#line 2588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 19762 "Photo.c" +#line 19777 "Photo.c" gboolean _result_ = FALSE; gboolean _tmp5_ = FALSE; { PhotoRow* _tmp2_ = NULL; -#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19771 "Photo.c" +#line 19786 "Photo.c" { gboolean _tmp3_ = FALSE; -#line 2591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_remove_transformation (self, "adjustments"); -#line 2591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2593 "/home/jens/Source/shotwell/src/Photo.vala" _result_ = _tmp3_; -#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2594 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); -#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2594 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = NULL; -#line 2593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2595 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); -#line 2593 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2595 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = NULL; -#line 19786 "Photo.c" +#line 19801 "Photo.c" } - __finally359: + __finally360: { PhotoRow* _tmp4_ = NULL; -#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19795 "Photo.c" +#line 19810 "Photo.c" } -#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2592 "/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 2590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2592 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19805 "Photo.c" +#line 19820 "Photo.c" } } -#line 2596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _result_; -#line 2596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2598 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 19812 "Photo.c" +#line 19827 "Photo.c" Alteration* _tmp6_ = NULL; Alteration* _tmp7_ = NULL; -#line 2597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = alteration_new ("image", "color-adjustments"); -#line 2597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 2597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp7_); -#line 2597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp7_); -#line 19823 "Photo.c" +#line 19838 "Photo.c" } -#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2601 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19827 "Photo.c" +#line 19842 "Photo.c" } -#line 2603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = new_adjustments; -#line 2603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = pixel_transformation_bundle_save (_tmp8_, "adjustments"); -#line 2603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2605 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp9_; -#line 19835 "Photo.c" +#line 19850 "Photo.c" { PhotoRow* _tmp10_ = NULL; -#line 2606 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->row; -#line 2606 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19842 "Photo.c" +#line 19857 "Photo.c" { gboolean _tmp11_ = FALSE; PixelTransformer* _tmp12_ = NULL; KeyValueMap* _tmp36_ = NULL; gboolean _tmp37_ = FALSE; -#line 2607 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->transformer; -#line 2607 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_ == NULL) { -#line 2607 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; -#line 19854 "Photo.c" +#line 19869 "Photo.c" } else { PixelTransformationBundle* _tmp13_ = NULL; -#line 2607 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->adjustments; -#line 2607 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp13_ == NULL; -#line 19861 "Photo.c" +#line 19876 "Photo.c" } -#line 2607 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 19865 "Photo.c" +#line 19880 "Photo.c" PixelTransformationBundle* _tmp14_ = NULL; PixelTransformationBundle* _tmp15_ = NULL; PixelTransformationBundle* _tmp16_ = NULL; PixelTransformer* _tmp17_ = NULL; -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = new_adjustments; -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = pixel_transformation_bundle_copy (_tmp14_); -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2611 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = _tmp15_; -#line 2610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = new_adjustments; -#line 2610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = pixel_transformation_bundle_generate_transformer (_tmp16_); -#line 2610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2612 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); -#line 2610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2612 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = _tmp17_; -#line 19886 "Photo.c" +#line 19901 "Photo.c" } else { PixelTransformationBundle* _tmp34_ = NULL; PixelTransformationBundle* _tmp35_ = NULL; @@ -19895,23 +19910,23 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad GeeIterable* _tmp20_ = NULL; GeeIterator* _tmp21_ = NULL; GeeIterator* _tmp22_ = NULL; -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = new_adjustments; -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = pixel_transformation_bundle_get_transformations (_tmp18_); -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = gee_iterable_iterator (_tmp20_); -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_; -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp20_); -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _transformation_it = _tmp22_; -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 19913 "Photo.c" +#line 19928 "Photo.c" GeeIterator* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; PixelTransformation* transformation = NULL; @@ -19924,108 +19939,108 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad PixelTransformation* _tmp31_ = NULL; PixelTransformation* _tmp32_ = NULL; PixelTransformation* _tmp33_ = NULL; -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _transformation_it; -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = gee_iterator_next (_tmp23_); -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp24_) { -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 19934 "Photo.c" +#line 19949 "Photo.c" } -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _transformation_it; -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = gee_iterator_get (_tmp25_); -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" transformation = (PixelTransformation*) _tmp26_; -#line 2614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = self->priv->transformer; -#line 2614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = self->priv->adjustments; -#line 2614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = transformation; -#line 2614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = pixel_transformation_get_transformation_type (_tmp29_); -#line 2614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = pixel_transformation_bundle_get_transformation (_tmp28_, _tmp30_); -#line 2614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_; -#line 2614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = transformation; -#line 2614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformer_replace_transformation (_tmp27_, _tmp32_, _tmp33_); -#line 2614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2616 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_unref0 (_tmp32_); -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_unref0 (transformation); -#line 19962 "Photo.c" +#line 19977 "Photo.c" } -#line 2613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2615 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_transformation_it); -#line 19966 "Photo.c" +#line 19981 "Photo.c" } -#line 2619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2621 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = new_adjustments; -#line 2619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2621 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = pixel_transformation_bundle_copy (_tmp34_); -#line 2619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2621 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); -#line 2619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2621 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = _tmp35_; -#line 19976 "Photo.c" +#line 19991 "Photo.c" } -#line 2622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = map; -#line 2622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2624 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = photo_set_transformation (self, _tmp36_); -#line 2622 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2624 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp37_; -#line 19984 "Photo.c" +#line 19999 "Photo.c" } - __finally360: + __finally361: { PhotoRow* _tmp38_ = NULL; -#line 2606 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = self->row; -#line 2606 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19993 "Photo.c" +#line 20008 "Photo.c" } -#line 2606 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2606 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2606 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2608 "/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 2606 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2606 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2608 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20005 "Photo.c" +#line 20020 "Photo.c" } } -#line 2625 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2627 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = committed; -#line 2625 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2627 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp39_) { -#line 20012 "Photo.c" +#line 20027 "Photo.c" Alteration* _tmp40_ = NULL; Alteration* _tmp41_ = NULL; -#line 2626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = alteration_new ("image", "color-adjustments"); -#line 2626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_; -#line 2626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp41_); -#line 2626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2628 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp41_); -#line 20023 "Photo.c" +#line 20038 "Photo.c" } -#line 2585 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2587 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 20027 "Photo.c" +#line 20042 "Photo.c" } @@ -20033,9 +20048,9 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { Photo * self; PhotoMetadata* result = NULL; GError * _inner_error_ = NULL; -#line 2630 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 20037 "Photo.c" +#line 20052 "Photo.c" { PhotoMetadata* _tmp0_ = NULL; PhotoFileReader* _tmp1_ = NULL; @@ -20043,67 +20058,67 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { PhotoMetadata* _tmp3_ = NULL; PhotoMetadata* _tmp4_ = NULL; PhotoMetadata* _tmp5_ = NULL; -#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_source_reader (self); -#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_reader_read_metadata (_tmp2_, &_inner_error_); -#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp2_); -#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp4_; -#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20059 "Photo.c" - goto __catch361_g_error; +#line 20074 "Photo.c" + goto __catch362_g_error; } -#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp0_; -#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (_tmp0_); -#line 2632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20072 "Photo.c" +#line 20087 "Photo.c" } - goto __finally361; - __catch361_g_error: + goto __finally362; + __catch362_g_error: { GError* err = NULL; GError* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; -#line 2631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2633 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 2631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2633 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2636 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = err; -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2636 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->message; -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2634: Unable to load metadata: %s", _tmp7_); #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" result = NULL; -#line 2636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2638 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 2636 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2638 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20096 "Photo.c" +#line 20111 "Photo.c" } - __finally361: -#line 2631 "/home/jens/Source/shotwell/src/Photo.vala" + __finally362: +#line 2633 "/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 2631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2633 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2633 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20105 "Photo.c" +#line 20120 "Photo.c" } @@ -20116,39 +20131,39 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) { PhotoMetadata* _tmp4_ = NULL; PhotoMetadata* _tmp5_ = NULL; GError * _inner_error_ = NULL; -#line 2640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2642 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_master_reader (self); -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_reader_read_metadata (_tmp2_, &_inner_error_); -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp2_); -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp4_; -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20138 "Photo.c" +#line 20153 "Photo.c" } -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp0_; -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (_tmp0_); -#line 2641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20150 "Photo.c" +#line 20165 "Photo.c" } @@ -20159,53 +20174,53 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) { PhotoMetadata* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; GError * _inner_error_ = NULL; -#line 2644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2646 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 2645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_editable_reader (self); -#line 2645 "/home/jens/Source/shotwell/src/Photo.vala" - reader = _tmp0_; #line 2647 "/home/jens/Source/shotwell/src/Photo.vala" + reader = _tmp0_; +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 20171 "Photo.c" +#line 20186 "Photo.c" PhotoFileReader* _tmp3_ = NULL; PhotoMetadata* _tmp4_ = NULL; -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = reader; -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_file_reader_read_metadata (_tmp3_, &_inner_error_); -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (_tmp1_); -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp4_; -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (_tmp1_); -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20192 "Photo.c" +#line 20207 "Photo.c" } } else { -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (_tmp1_); -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 20199 "Photo.c" +#line 20214 "Photo.c" } -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 2647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2649 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20207 "Photo.c" +#line 20222 "Photo.c" } @@ -20228,180 +20243,180 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph gboolean _tmp12_ = FALSE; PhotoReimportMasterState* _tmp13_ = NULL; GError * _inner_error_ = NULL; -#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2655 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2653 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (IS_PHOTO_METADATA (metadata), FALSE); #line 2655 "/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" _photo_reimport_master_state_unref0 (_vala_state); -#line 2655 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = NULL; #line 2657 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_state = NULL; +#line 2659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_master_reader (self); -#line 2657 "/home/jens/Source/shotwell/src/Photo.vala" - master_reader = _tmp0_; #line 2659 "/home/jens/Source/shotwell/src/Photo.vala" + master_reader = _tmp0_; +#line 2661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = master_reader; -#line 2659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2661 "/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 2659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2661 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 2660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); -#line 2660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20258 "Photo.c" +#line 20273 "Photo.c" } else { -#line 2660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20262 "Photo.c" +#line 20277 "Photo.c" } -#line 2660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20266 "Photo.c" +#line 20281 "Photo.c" } -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = master_reader; -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_file_reader_create_metadata_writer (_tmp5_, &_inner_error_); -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp6_; -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 20282 "Photo.c" +#line 20297 "Photo.c" } -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp4_; -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = NULL; -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = metadata; -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp8_, _tmp9_, &_inner_error_); -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp8_); -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp4_); -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); -#line 2662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 20306 "Photo.c" +#line 20321 "Photo.c" } -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_prepare_for_reimport_master (self, &_tmp11_, &_inner_error_); -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = _tmp11_; -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp12_; -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp4_); -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 20326 "Photo.c" +#line 20341 "Photo.c" } -#line 2664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2666 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp10_) { -#line 2665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp4_); -#line 2665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); -#line 2665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20340 "Photo.c" +#line 20355 "Photo.c" } else { -#line 2665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20344 "Photo.c" +#line 20359 "Photo.c" } -#line 2665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20348 "Photo.c" +#line 20363 "Photo.c" } -#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2669 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _vala_state; -#line 2667 "/home/jens/Source/shotwell/src/Photo.vala" - G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE; #line 2669 "/home/jens/Source/shotwell/src/Photo.vala" + G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE; +#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 2669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp4_); -#line 2669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); -#line 2669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20364 "Photo.c" +#line 20379 "Photo.c" } else { -#line 2669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20368 "Photo.c" +#line 20383 "Photo.c" } -#line 2669 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2671 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20372 "Photo.c" +#line 20387 "Photo.c" } void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error) { PhotoReimportMasterState* _tmp0_ = NULL; GError * _inner_error_ = NULL; -#line 2672 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2674 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2672 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2674 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state)); -#line 2673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = state; -#line 2673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" photo_finish_reimport_master (self, _tmp0_, &_inner_error_); -#line 2673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 2673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20395 "Photo.c" +#line 20410 "Photo.c" } else { -#line 2673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2675 "/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 2673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2675 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20403 "Photo.c" +#line 20418 "Photo.c" } } } @@ -20427,202 +20442,202 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, gboolean _tmp13_ = FALSE; PhotoReimportEditableState* _tmp14_ = NULL; GError * _inner_error_ = NULL; -#line 2676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2678 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2676 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (IS_PHOTO_METADATA (metadata), FALSE); #line 2678 "/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" _photo_reimport_editable_state_unref0 (_vala_state); -#line 2678 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = NULL; #line 2680 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_state = NULL; +#line 2682 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_editable_reader (self); -#line 2680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2682 "/home/jens/Source/shotwell/src/Photo.vala" editable_reader = _tmp0_; -#line 2681 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = editable_reader; -#line 2681 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 2682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20453 "Photo.c" +#line 20468 "Photo.c" } else { -#line 2682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20457 "Photo.c" +#line 20472 "Photo.c" } -#line 2682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20461 "Photo.c" +#line 20476 "Photo.c" } -#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = editable_reader; -#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2686 "/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 2684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_file_format_can_write_metadata (_tmp3_); -#line 2684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2686 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp4_) { -#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20479 "Photo.c" +#line 20494 "Photo.c" } else { -#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20483 "Photo.c" +#line 20498 "Photo.c" } -#line 2685 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20487 "Photo.c" +#line 20502 "Photo.c" } -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = editable_reader; -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_file_reader_create_metadata_writer (_tmp6_, &_inner_error_); -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp7_; -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 20503 "Photo.c" +#line 20518 "Photo.c" } -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp5_; -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = NULL; -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = metadata; -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp9_, _tmp10_, &_inner_error_); -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp9_); -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp5_); -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2687 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 20527 "Photo.c" +#line 20542 "Photo.c" } -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_prepare_for_reimport_editable (self, &_tmp12_, &_inner_error_); -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = _tmp12_; -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp13_; -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp5_); -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 20547 "Photo.c" +#line 20562 "Photo.c" } -#line 2689 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2691 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp11_) { -#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp5_); -#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20561 "Photo.c" +#line 20576 "Photo.c" } else { -#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20565 "Photo.c" +#line 20580 "Photo.c" } -#line 2690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20569 "Photo.c" +#line 20584 "Photo.c" } -#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _vala_state; -#line 2692 "/home/jens/Source/shotwell/src/Photo.vala" - G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE; #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" + G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE; +#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp5_); -#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); -#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20585 "Photo.c" +#line 20600 "Photo.c" } else { -#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20589 "Photo.c" +#line 20604 "Photo.c" } -#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2696 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20593 "Photo.c" +#line 20608 "Photo.c" } void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error) { PhotoReimportEditableState* _tmp0_ = NULL; GError * _inner_error_ = NULL; -#line 2697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2699 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2699 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_EDITABLE_STATE (state)); -#line 2698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = state; -#line 2698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" photo_finish_reimport_editable (self, _tmp0_, &_inner_error_); -#line 2698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 2698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 2698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20616 "Photo.c" +#line 20631 "Photo.c" } else { -#line 2698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2700 "/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 2698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2700 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20624 "Photo.c" +#line 20639 "Photo.c" } } } @@ -20630,54 +20645,54 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt void photo_get_raw_dimensions (Photo* self, Dimensions* result) { GError * _inner_error_ = NULL; -#line 2703 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 20634 "Photo.c" +#line 20649 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20641 "Photo.c" +#line 20656 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; Dimensions _tmp2_ = {0}; -#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2707 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->backing_photo_row; -#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2707 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->dim; -#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2707 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 20651 "Photo.c" +#line 20666 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 2704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20658 "Photo.c" +#line 20673 "Photo.c" } -#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2707 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20662 "Photo.c" +#line 20677 "Photo.c" } - __finally362: + __finally363: { PhotoRow* _tmp4_ = NULL; -#line 2704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20671 "Photo.c" +#line 20686 "Photo.c" } -#line 2704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/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 2704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2706 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20679 "Photo.c" +#line 20694 "Photo.c" } } @@ -20685,77 +20700,77 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) { gboolean photo_has_transformations (Photo* self) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 2709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 20689 "Photo.c" +#line 20704 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20696 "Photo.c" +#line 20711 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoRow* _tmp2_ = NULL; Orientation _tmp3_ = 0; BackingPhotoRow* _tmp4_ = NULL; Orientation _tmp5_ = 0; -#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->orientation; -#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->backing_photo_row; -#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->original_orientation; -#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != _tmp5_) { -#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2714 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = TRUE; -#line 20715 "Photo.c" +#line 20730 "Photo.c" } else { PhotoRow* _tmp6_ = NULL; GeeHashMap* _tmp7_ = NULL; -#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2715 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2715 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->transformations; -#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2715 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp7_ != NULL; -#line 20725 "Photo.c" +#line 20740 "Photo.c" } -#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 20729 "Photo.c" +#line 20744 "Photo.c" { PhotoRow* _tmp8_ = NULL; -#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; -#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20736 "Photo.c" +#line 20751 "Photo.c" } -#line 2711 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2713 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20740 "Photo.c" +#line 20755 "Photo.c" } - __finally363: + __finally364: { PhotoRow* _tmp9_ = NULL; -#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20749 "Photo.c" +#line 20764 "Photo.c" } -#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2712 "/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 2710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2712 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 20757 "Photo.c" +#line 20772 "Photo.c" } } @@ -20767,152 +20782,152 @@ gboolean photo_only_metadata_changed (Photo* self) { PhotoMetadata* _tmp0_ = NULL; PhotoMetadata* _tmp1_ = NULL; GError * _inner_error_ = NULL; -#line 2717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2718 "/home/jens/Source/shotwell/src/Photo.vala" - date_time = NULL; #line 2720 "/home/jens/Source/shotwell/src/Photo.vala" + date_time = NULL; +#line 2722 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource)); -#line 2720 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2722 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp0_; -#line 2721 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2723 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = metadata; -#line 2721 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2723 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 20781 "Photo.c" +#line 20796 "Photo.c" PhotoMetadata* _tmp2_ = NULL; MetadataDateTime* _tmp3_ = NULL; -#line 2722 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 2722 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_metadata_get_exposure_date_time (_tmp2_); -#line 2722 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2722 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" date_time = _tmp3_; -#line 20792 "Photo.c" +#line 20807 "Photo.c" } { PhotoRow* _tmp4_ = NULL; -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20800 "Photo.c" +#line 20815 "Photo.c" { gboolean _tmp5_ = FALSE; PhotoRow* _tmp6_ = NULL; GeeHashMap* _tmp7_ = NULL; -#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->transformations; -#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_ == NULL) { -#line 20811 "Photo.c" +#line 20826 "Photo.c" gboolean _tmp8_ = FALSE; PhotoRow* _tmp9_ = NULL; Orientation _tmp10_ = 0; BackingPhotoRow* _tmp11_ = NULL; Orientation _tmp12_ = 0; -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->orientation; -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->backing_photo_row; -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->original_orientation; -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_ != _tmp12_) { -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = TRUE; -#line 20829 "Photo.c" +#line 20844 "Photo.c" } else { gboolean _tmp13_ = FALSE; MetadataDateTime* _tmp14_ = NULL; -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = date_time; -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 20837 "Photo.c" +#line 20852 "Photo.c" PhotoRow* _tmp15_ = NULL; time_t _tmp16_ = 0; MetadataDateTime* _tmp17_ = NULL; time_t _tmp18_ = 0; -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_->exposure_time; -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = date_time; -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = metadata_date_time_get_timestamp (_tmp17_); -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp16_ != _tmp18_; -#line 20852 "Photo.c" +#line 20867 "Photo.c" } else { -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = FALSE; -#line 20856 "Photo.c" +#line 20871 "Photo.c" } -#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp13_; -#line 20860 "Photo.c" +#line 20875 "Photo.c" } -#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2728 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp8_; -#line 20864 "Photo.c" +#line 20879 "Photo.c" } else { -#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = FALSE; -#line 20868 "Photo.c" +#line 20883 "Photo.c" } -#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 20872 "Photo.c" +#line 20887 "Photo.c" { PhotoRow* _tmp19_ = NULL; -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20879 "Photo.c" +#line 20894 "Photo.c" } -#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2727 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20887 "Photo.c" +#line 20902 "Photo.c" } - __finally364: + __finally365: { PhotoRow* _tmp20_ = NULL; -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->row; -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20896 "Photo.c" +#line 20911 "Photo.c" } -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/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 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2726 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 20908 "Photo.c" +#line 20923 "Photo.c" } -#line 2717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 20914 "Photo.c" +#line 20929 "Photo.c" } @@ -20926,142 +20941,142 @@ gboolean photo_has_alterations (Photo* self) { PhotoMetadata* _tmp1_ = NULL; MetadataDateTime* _tmp8_ = NULL; GError * _inner_error_ = NULL; -#line 2731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2733 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2732 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2734 "/home/jens/Source/shotwell/src/Photo.vala" date_time = NULL; -#line 2733 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2735 "/home/jens/Source/shotwell/src/Photo.vala" title = NULL; -#line 2734 "/home/jens/Source/shotwell/src/Photo.vala" - comment = NULL; #line 2736 "/home/jens/Source/shotwell/src/Photo.vala" + comment = NULL; +#line 2738 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource)); -#line 2736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2738 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp0_; -#line 2737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2739 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = metadata; -#line 2737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2739 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 20944 "Photo.c" +#line 20959 "Photo.c" PhotoMetadata* _tmp2_ = NULL; MetadataDateTime* _tmp3_ = NULL; PhotoMetadata* _tmp4_ = NULL; gchar* _tmp5_ = NULL; PhotoMetadata* _tmp6_ = NULL; gchar* _tmp7_ = NULL; -#line 2738 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2740 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 2738 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2740 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_metadata_get_exposure_date_time (_tmp2_); -#line 2738 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2740 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2738 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2740 "/home/jens/Source/shotwell/src/Photo.vala" date_time = _tmp3_; -#line 2739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2741 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = metadata; -#line 2739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2741 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 2739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2741 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 2739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2741 "/home/jens/Source/shotwell/src/Photo.vala" title = _tmp5_; -#line 2740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2742 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = metadata; -#line 2740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2742 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_METADATA, MediaMetadata)); -#line 2740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2742 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 2740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2742 "/home/jens/Source/shotwell/src/Photo.vala" comment = _tmp7_; -#line 20975 "Photo.c" +#line 20990 "Photo.c" } -#line 2744 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = date_time; -#line 2744 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ == NULL) { -#line 20981 "Photo.c" +#line 20996 "Photo.c" { PhotoRow* _tmp9_ = NULL; -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20988 "Photo.c" +#line 21003 "Photo.c" { BackingPhotoRow* _tmp10_ = NULL; time_t _tmp11_ = 0; PhotoRow* _tmp12_ = NULL; time_t _tmp13_ = 0; -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->backing_photo_row; -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_->timestamp; -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->row; -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_->exposure_time; -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_ != _tmp13_) { #line 2750 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp11_ != _tmp13_) { +#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 21006 "Photo.c" +#line 21021 "Photo.c" { PhotoRow* _tmp14_ = NULL; -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21013 "Photo.c" +#line 21028 "Photo.c" } -#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2752 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21025 "Photo.c" +#line 21040 "Photo.c" } } - __finally365: + __finally366: { PhotoRow* _tmp15_ = NULL; -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21035 "Photo.c" +#line 21050 "Photo.c" } -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/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 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 21053 "Photo.c" +#line 21068 "Photo.c" } } } { PhotoRow* _tmp16_ = NULL; -#line 2755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->row; -#line 2755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21063 "Photo.c" +#line 21078 "Photo.c" { gboolean _tmp17_ = FALSE; gboolean _tmp18_ = FALSE; @@ -21069,184 +21084,184 @@ gboolean photo_has_alterations (Photo* self) { gboolean _tmp20_ = FALSE; PhotoRow* _tmp21_ = NULL; GeeHashMap* _tmp22_ = NULL; -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = self->row; -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_->transformations; -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_ != NULL) { -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = TRUE; -#line 21079 "Photo.c" +#line 21094 "Photo.c" } else { PhotoRow* _tmp23_ = NULL; Orientation _tmp24_ = 0; BackingPhotoRow* _tmp25_ = NULL; Orientation _tmp26_ = 0; -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = self->row; -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_->orientation; -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->backing_photo_row; -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_->original_orientation; -#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp24_ != _tmp26_; -#line 21095 "Photo.c" +#line 21110 "Photo.c" } -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp20_) { -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = TRUE; -#line 21101 "Photo.c" +#line 21116 "Photo.c" } else { gboolean _tmp27_ = FALSE; MetadataDateTime* _tmp28_ = NULL; -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = date_time; -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_ != NULL) { -#line 21109 "Photo.c" +#line 21124 "Photo.c" PhotoRow* _tmp29_ = NULL; time_t _tmp30_ = 0; MetadataDateTime* _tmp31_ = NULL; time_t _tmp32_ = 0; -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = self->row; -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_->exposure_time; -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = date_time; -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = metadata_date_time_get_timestamp (_tmp31_); -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp30_ != _tmp32_; -#line 21124 "Photo.c" +#line 21139 "Photo.c" } else { -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = FALSE; -#line 21128 "Photo.c" +#line 21143 "Photo.c" } -#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp27_; -#line 21132 "Photo.c" +#line 21147 "Photo.c" } -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_) { -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = TRUE; -#line 21138 "Photo.c" +#line 21153 "Photo.c" } else { gchar* _tmp33_ = NULL; gchar* _tmp34_ = NULL; const gchar* _tmp35_ = NULL; -#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_; -#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = comment; -#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = g_strcmp0 (_tmp34_, _tmp35_) != 0; -#line 2759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2761 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp34_); -#line 21153 "Photo.c" +#line 21168 "Photo.c" } -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_) { -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = TRUE; -#line 21159 "Photo.c" +#line 21174 "Photo.c" } else { gchar* _tmp36_ = NULL; gchar* _tmp37_ = NULL; const gchar* _tmp38_ = NULL; -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_; -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = title; -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = g_strcmp0 (_tmp37_, _tmp38_) != 0; -#line 2760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2762 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp37_); -#line 21174 "Photo.c" +#line 21189 "Photo.c" } -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp17_; -#line 21178 "Photo.c" +#line 21193 "Photo.c" { PhotoRow* _tmp39_ = NULL; -#line 2755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = self->row; -#line 2755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21185 "Photo.c" +#line 21200 "Photo.c" } -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2758 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21197 "Photo.c" +#line 21212 "Photo.c" } - __finally366: + __finally367: { PhotoRow* _tmp40_ = NULL; -#line 2755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = self->row; -#line 2755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21206 "Photo.c" +#line 21221 "Photo.c" } -#line 2755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 2755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 2755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 2755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/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 2755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2757 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 21222 "Photo.c" +#line 21237 "Photo.c" } -#line 2731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2733 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 2731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2733 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); -#line 2731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2733 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); -#line 2731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2733 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 21232 "Photo.c" +#line 21247 "Photo.c" } PhotoTransformationState* photo_save_transformation_state (Photo* self) { PhotoTransformationState* result = NULL; GError * _inner_error_ = NULL; -#line 2765 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 21241 "Photo.c" +#line 21256 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21248 "Photo.c" +#line 21263 "Photo.c" { PixelTransformer* _tmp1_ = NULL; PixelTransformer* _tmp2_ = NULL; @@ -21257,112 +21272,112 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { PhotoRow* _tmp11_ = NULL; GeeHashMap* _tmp12_ = NULL; PhotoPhotoTransformationStateImpl* _tmp13_ = NULL; -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->transformer; -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 21263 "Photo.c" +#line 21278 "Photo.c" PixelTransformer* _tmp3_ = NULL; PixelTransformer* _tmp4_ = NULL; -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->transformer; -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = pixel_transformer_copy (_tmp3_); -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp1_); -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp4_; -#line 21274 "Photo.c" +#line 21289 "Photo.c" } else { -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp1_); -#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 21280 "Photo.c" +#line 21295 "Photo.c" } -#line 2770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->adjustments; -#line 2770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != NULL) { -#line 21286 "Photo.c" +#line 21301 "Photo.c" PixelTransformationBundle* _tmp7_ = NULL; PixelTransformationBundle* _tmp8_ = NULL; -#line 2770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->adjustments; -#line 2770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = pixel_transformation_bundle_copy (_tmp7_); -#line 2770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp5_); -#line 2770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp8_; -#line 21297 "Photo.c" +#line 21312 "Photo.c" } else { -#line 2770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp5_); -#line 2770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = NULL; -#line 21303 "Photo.c" +#line 21318 "Photo.c" } -#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->orientation; -#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->transformations; -#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_photo_transformation_state_impl_new (self, _tmp10_, _tmp12_, _tmp1_, _tmp5_); -#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState); -#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp5_); -#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp1_); -#line 21321 "Photo.c" +#line 21336 "Photo.c" { PhotoRow* _tmp14_ = NULL; -#line 2766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21328 "Photo.c" +#line 21343 "Photo.c" } -#line 2767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2769 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21332 "Photo.c" +#line 21347 "Photo.c" } - __finally367: + __finally368: { PhotoRow* _tmp15_ = NULL; -#line 2766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 2766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21341 "Photo.c" +#line 21356 "Photo.c" } -#line 2766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2768 "/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 2766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2766 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2768 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 21349 "Photo.c" +#line 21364 "Photo.c" } } static gpointer _pixel_transformer_ref0 (gpointer self) { -#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2793 "/home/jens/Source/shotwell/src/Photo.vala" return self ? pixel_transformer_ref (self) : NULL; -#line 21357 "Photo.c" +#line 21372 "Photo.c" } static gpointer _pixel_transformation_bundle_ref0 (gpointer self) { -#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2794 "/home/jens/Source/shotwell/src/Photo.vala" return self ? pixel_transformation_bundle_ref (self) : NULL; -#line 21364 "Photo.c" +#line 21379 "Photo.c" } @@ -21387,60 +21402,60 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* gboolean committed = FALSE; gboolean _tmp30_ = FALSE; GError * _inner_error_ = NULL; -#line 2774 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2774 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_TRANSFORMATION_STATE (state), FALSE); -#line 2775 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = state; -#line 2775 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/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 2775 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" state_impl = _tmp1_; -#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2778 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = state_impl; -#line 2776 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2778 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (state_impl); -#line 2777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21409 "Photo.c" +#line 21424 "Photo.c" } -#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = state_impl; -#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_photo_transformation_state_impl_get_orientation (_tmp3_); -#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" saved_orientation = _tmp4_; -#line 2780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2782 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = state_impl; -#line 2780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2782 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_photo_transformation_state_impl_get_transformations (_tmp5_); -#line 2780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2782 "/home/jens/Source/shotwell/src/Photo.vala" saved_transformations = _tmp6_; -#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2783 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = state_impl; -#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2783 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_photo_transformation_state_impl_get_transformer (_tmp7_); -#line 2781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2783 "/home/jens/Source/shotwell/src/Photo.vala" saved_transformer = _tmp8_; -#line 2782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2784 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = state_impl; -#line 2782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2784 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_photo_transformation_state_impl_get_color_adjustments (_tmp9_); -#line 2782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2784 "/home/jens/Source/shotwell/src/Photo.vala" saved_adjustments = _tmp10_; -#line 21435 "Photo.c" +#line 21450 "Photo.c" { PhotoRow* _tmp11_ = NULL; -#line 2785 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2785 "/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 21442 "Photo.c" +#line 21457 "Photo.c" { PhotoTable* _tmp12_ = NULL; PhotoTable* _tmp13_ = NULL; @@ -21450,29 +21465,29 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* GeeHashMap* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; -#line 2786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_table_get_instance (); -#line 2786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 2786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->photo_id; -#line 2786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = saved_orientation; -#line 2786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = saved_transformations; -#line 2786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = photo_table_set_transformation_state (_tmp13_, &_tmp15_, _tmp16_, _tmp17_); -#line 2786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp18_; -#line 2786 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp13_); #line 2788 "/home/jens/Source/shotwell/src/Photo.vala" + _database_table_unref0 (_tmp13_); +#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = committed; -#line 2788 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_) { -#line 21474 "Photo.c" +#line 21489 "Photo.c" PhotoRow* _tmp20_ = NULL; Orientation _tmp21_ = 0; PhotoRow* _tmp22_ = NULL; @@ -21482,108 +21497,108 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* PixelTransformer* _tmp26_ = NULL; PixelTransformationBundle* _tmp27_ = NULL; PixelTransformationBundle* _tmp28_ = NULL; -#line 2789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->row; -#line 2789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = saved_orientation; -#line 2789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_->orientation = _tmp21_; -#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = self->row; -#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = saved_transformations; -#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _g_object_ref0 (_tmp23_); -#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp22_->transformations); -#line 2790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_->transformations = _tmp24_; -#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2793 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = saved_transformer; -#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2793 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _pixel_transformer_ref0 (_tmp25_); -#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2793 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); -#line 2791 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2793 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = _tmp26_; -#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2794 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = saved_adjustments; -#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2794 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _pixel_transformation_bundle_ref0 (_tmp27_); -#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2794 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); -#line 2792 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2794 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = _tmp28_; -#line 21516 "Photo.c" +#line 21531 "Photo.c" } } - __finally368: + __finally369: { PhotoRow* _tmp29_ = NULL; -#line 2785 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = self->row; -#line 2785 "/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 21526 "Photo.c" +#line 21541 "Photo.c" } -#line 2785 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2785 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (saved_adjustments); -#line 2785 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (saved_transformer); -#line 2785 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (saved_transformations); -#line 2785 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (state_impl); -#line 2785 "/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 2785 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2785 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2787 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 21544 "Photo.c" +#line 21559 "Photo.c" } } -#line 2796 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2798 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = committed; -#line 2796 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2798 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp30_) { -#line 21551 "Photo.c" +#line 21566 "Photo.c" Alteration* _tmp31_ = NULL; Alteration* _tmp32_ = NULL; -#line 2797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = alteration_new ("image", "transformation-state"); -#line 2797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_; -#line 2797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp32_); -#line 2797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp32_); -#line 21562 "Photo.c" +#line 21577 "Photo.c" } -#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; -#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (saved_adjustments); -#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (saved_transformer); -#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (saved_transformations); -#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (state_impl); -#line 2799 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2801 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21576 "Photo.c" +#line 21591 "Photo.c" } void photo_remove_all_transformations (Photo* self) { -#line 2802 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2804 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2805 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, TRUE); -#line 21585 "Photo.c" +#line 21600 "Photo.c" } @@ -21592,18 +21607,18 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not gboolean _tmp21_ = FALSE; gboolean _tmp22_ = FALSE; GError * _inner_error_ = NULL; -#line 2806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2808 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2809 "/home/jens/Source/shotwell/src/Photo.vala" is_altered = FALSE; -#line 21598 "Photo.c" +#line 21613 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21605 "Photo.c" +#line 21620 "Photo.c" { PhotoTable* _tmp1_ = NULL; PhotoTable* _tmp2_ = NULL; @@ -21615,45 +21630,45 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not Orientation _tmp8_ = 0; BackingPhotoRow* _tmp9_ = NULL; Orientation _tmp10_ = 0; -#line 2809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 2809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 2809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->photo_id; -#line 2809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_table_remove_all_transformations (_tmp2_, &_tmp4_); -#line 2809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" is_altered = _tmp5_; -#line 2809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2811 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2812 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2812 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp6_->transformations); -#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_->transformations = NULL; #line 2812 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp6_->transformations = NULL; +#line 2814 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); -#line 2812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2814 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = NULL; -#line 2813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2815 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); -#line 2813 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->adjustments = NULL; #line 2815 "/home/jens/Source/shotwell/src/Photo.vala" + self->priv->adjustments = NULL; +#line 2817 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 2815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2817 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->orientation; -#line 2815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2817 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->backing_photo_row; -#line 2815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2817 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->original_orientation; -#line 2815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2817 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != _tmp10_) { -#line 21655 "Photo.c" +#line 21670 "Photo.c" PhotoTable* _tmp11_ = NULL; PhotoTable* _tmp12_ = NULL; PhotoRow* _tmp13_ = NULL; @@ -21663,85 +21678,85 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not PhotoRow* _tmp17_ = NULL; BackingPhotoRow* _tmp18_ = NULL; Orientation _tmp19_ = 0; -#line 2816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_table_get_instance (); -#line 2816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_; -#line 2816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->row; -#line 2816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->photo_id; -#line 2816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->backing_photo_row; -#line 2816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_->original_orientation; -#line 2816 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_set_orientation (_tmp12_, &_tmp14_, _tmp16_); -#line 2816 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp12_); #line 2818 "/home/jens/Source/shotwell/src/Photo.vala" + _database_table_unref0 (_tmp12_); +#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->row; -#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->backing_photo_row; -#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->original_orientation; -#line 2818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_->orientation = _tmp19_; -#line 2819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2821 "/home/jens/Source/shotwell/src/Photo.vala" is_altered = TRUE; -#line 21691 "Photo.c" +#line 21706 "Photo.c" } } - __finally369: + __finally370: { PhotoRow* _tmp20_ = NULL; -#line 2808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->row; -#line 2808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21701 "Photo.c" +#line 21716 "Photo.c" } -#line 2808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2810 "/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 2808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2810 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 21711 "Photo.c" +#line 21726 "Photo.c" } } -#line 2823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = is_altered; -#line 2823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2825 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_) { -#line 21718 "Photo.c" +#line 21733 "Photo.c" gboolean _tmp23_ = FALSE; -#line 2823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = notify; -#line 2823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp23_; -#line 21724 "Photo.c" +#line 21739 "Photo.c" } else { -#line 2823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2825 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = FALSE; -#line 21728 "Photo.c" +#line 21743 "Photo.c" } -#line 2823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2825 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 21732 "Photo.c" +#line 21747 "Photo.c" Alteration* _tmp24_ = NULL; Alteration* _tmp25_ = NULL; -#line 2824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2826 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = alteration_new ("image", "revert"); -#line 2824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2826 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_; -#line 2824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2826 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); -#line 2824 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2826 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp25_); -#line 21743 "Photo.c" +#line 21758 "Photo.c" } } @@ -21749,54 +21764,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 2827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2829 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 21753 "Photo.c" +#line 21768 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21760 "Photo.c" +#line 21775 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; Orientation _tmp2_ = 0; -#line 2829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2831 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->backing_photo_row; -#line 2829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2831 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->original_orientation; -#line 2829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2831 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 21770 "Photo.c" +#line 21785 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 2828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21777 "Photo.c" +#line 21792 "Photo.c" } -#line 2829 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2831 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21781 "Photo.c" +#line 21796 "Photo.c" } - __finally370: + __finally371: { PhotoRow* _tmp4_ = NULL; -#line 2828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21790 "Photo.c" +#line 21805 "Photo.c" } -#line 2828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/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 2828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 21798 "Photo.c" +#line 21813 "Photo.c" } } @@ -21804,54 +21819,54 @@ Orientation photo_get_original_orientation (Photo* self) { Orientation photo_get_orientation (Photo* self) { Orientation result = 0; GError * _inner_error_ = NULL; -#line 2833 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2835 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 21808 "Photo.c" +#line 21823 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21815 "Photo.c" +#line 21830 "Photo.c" { PhotoRow* _tmp1_ = NULL; Orientation _tmp2_ = 0; -#line 2835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->orientation; -#line 2835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 21825 "Photo.c" +#line 21840 "Photo.c" { PhotoRow* _tmp3_ = NULL; -#line 2834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21832 "Photo.c" +#line 21847 "Photo.c" } -#line 2835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2837 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21836 "Photo.c" +#line 21851 "Photo.c" } - __finally371: + __finally372: { PhotoRow* _tmp4_ = NULL; -#line 2834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21845 "Photo.c" +#line 21860 "Photo.c" } -#line 2834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/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 2834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2836 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 21853 "Photo.c" +#line 21868 "Photo.c" } } @@ -21861,31 +21876,31 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) { gboolean committed = FALSE; gboolean _tmp14_ = FALSE; GError * _inner_error_ = NULL; -#line 2839 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2841 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2840 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2842 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 21867 "Photo.c" +#line 21882 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2841 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2841 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21874 "Photo.c" +#line 21889 "Photo.c" { PhotoRow* _tmp1_ = NULL; Orientation _tmp2_ = 0; Orientation _tmp3_ = 0; -#line 2842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->orientation; -#line 2842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = orientation; -#line 2842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != _tmp3_) { -#line 21887 "Photo.c" +#line 21902 "Photo.c" PhotoTable* _tmp4_ = NULL; PhotoTable* _tmp5_ = NULL; PhotoRow* _tmp6_ = NULL; @@ -21893,96 +21908,96 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) { Orientation _tmp8_ = 0; gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_table_get_instance (); -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->photo_id; -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = orientation; -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_table_set_orientation (_tmp5_, &_tmp7_, _tmp8_); -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" committed = _tmp9_; -#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp5_); -#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2846 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = committed; -#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2846 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_) { -#line 21915 "Photo.c" +#line 21930 "Photo.c" PhotoRow* _tmp11_ = NULL; Orientation _tmp12_ = 0; -#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = orientation; -#line 2845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_->orientation = _tmp12_; -#line 21924 "Photo.c" +#line 21939 "Photo.c" } } } - __finally372: + __finally373: { PhotoRow* _tmp13_ = NULL; -#line 2841 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->row; -#line 2841 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21935 "Photo.c" +#line 21950 "Photo.c" } -#line 2841 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2841 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2843 "/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 2841 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2841 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2843 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 21945 "Photo.c" +#line 21960 "Photo.c" } } -#line 2849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = committed; -#line 2849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2851 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_) { -#line 21952 "Photo.c" +#line 21967 "Photo.c" Alteration* _tmp15_ = NULL; Alteration* _tmp16_ = NULL; -#line 2850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2852 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = alteration_new ("image", "orientation"); -#line 2850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2852 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 2850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2852 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_); -#line 2850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2852 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp16_); -#line 21963 "Photo.c" +#line 21978 "Photo.c" } -#line 2852 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2854 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; -#line 2852 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2854 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21969 "Photo.c" +#line 21984 "Photo.c" } gboolean photo_check_can_rotate (Photo* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 2855 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2857 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2858 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->can_rotate_now; -#line 2856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2858 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 2856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2858 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21984 "Photo.c" +#line 21999 "Photo.c" } @@ -21990,134 +22005,134 @@ static void photo_real_rotate (Photo* self, Rotation rotation) { GError * _inner_error_ = NULL; { PhotoRow* _tmp0_ = NULL; -#line 2860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2860 "/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 21996 "Photo.c" +#line 22011 "Photo.c" { Orientation _tmp1_ = 0; Rotation _tmp2_ = 0; Orientation _tmp3_ = 0; -#line 2861 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_orientation (self); -#line 2861 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = rotation; -#line 2861 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = orientation_perform (_tmp1_, _tmp2_); -#line 2861 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp3_); -#line 22009 "Photo.c" +#line 22024 "Photo.c" } - __finally373: + __finally374: { PhotoRow* _tmp4_ = NULL; -#line 2860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2860 "/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 22018 "Photo.c" +#line 22033 "Photo.c" } -#line 2860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2860 "/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 2860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2862 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 22028 "Photo.c" +#line 22043 "Photo.c" } } } void photo_rotate (Photo* self, Rotation rotation) { -#line 2859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2861 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2859 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2861 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->rotate (self, rotation); -#line 22039 "Photo.c" +#line 22054 "Photo.c" } static gboolean photo_has_transformation (Photo* self, const gchar* name) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 2865 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2865 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (name != NULL, FALSE); -#line 22050 "Photo.c" +#line 22065 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22057 "Photo.c" +#line 22072 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoRow* _tmp2_ = NULL; GeeHashMap* _tmp3_ = NULL; -#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->transformations; -#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 22068 "Photo.c" +#line 22083 "Photo.c" PhotoRow* _tmp4_ = NULL; GeeHashMap* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; -#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->transformations; -#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = name; -#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2869 "/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 2867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp7_; -#line 22083 "Photo.c" +#line 22098 "Photo.c" } else { -#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 22087 "Photo.c" +#line 22102 "Photo.c" } -#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 22091 "Photo.c" +#line 22106 "Photo.c" { PhotoRow* _tmp8_ = NULL; -#line 2866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; -#line 2866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22098 "Photo.c" +#line 22113 "Photo.c" } -#line 2867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2869 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22102 "Photo.c" +#line 22117 "Photo.c" } - __finally374: + __finally375: { PhotoRow* _tmp9_ = NULL; -#line 2866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 2866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22111 "Photo.c" +#line 22126 "Photo.c" } -#line 2866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2868 "/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 2866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2868 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 22119 "Photo.c" +#line 22134 "Photo.c" } } @@ -22126,111 +22141,111 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { KeyValueMap* result = NULL; KeyValueMap* map = NULL; GError * _inner_error_ = NULL; -#line 2874 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2876 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 2874 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2876 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (name != NULL, NULL); -#line 2875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2877 "/home/jens/Source/shotwell/src/Photo.vala" map = NULL; -#line 22134 "Photo.c" +#line 22149 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22141 "Photo.c" +#line 22156 "Photo.c" { PhotoRow* _tmp1_ = NULL; GeeHashMap* _tmp2_ = NULL; -#line 2877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->transformations; -#line 2877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2879 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 22151 "Photo.c" +#line 22166 "Photo.c" PhotoRow* _tmp3_ = NULL; GeeHashMap* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; gpointer _tmp6_ = NULL; KeyValueMap* _tmp7_ = NULL; -#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->transformations; -#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = name; -#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2880 "/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 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" map = (KeyValueMap*) _tmp6_; -#line 2879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = map; -#line 2879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2881 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_ != NULL) { -#line 22173 "Photo.c" +#line 22188 "Photo.c" KeyValueMap* _tmp8_ = NULL; KeyValueMap* _tmp9_ = NULL; -#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = map; -#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = key_value_map_copy (_tmp8_); -#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp9_; -#line 22184 "Photo.c" +#line 22199 "Photo.c" } } } - __finally375: + __finally376: { PhotoRow* _tmp10_ = NULL; -#line 2876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->row; -#line 2876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22195 "Photo.c" +#line 22210 "Photo.c" } -#line 2876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2878 "/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 2876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2878 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 22207 "Photo.c" +#line 22222 "Photo.c" } } -#line 2884 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2886 "/home/jens/Source/shotwell/src/Photo.vala" result = map; -#line 2884 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2886 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22214 "Photo.c" +#line 22229 "Photo.c" } static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) { gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 2887 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2889 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2887 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2889 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_KEY_VALUE_MAP (trans), FALSE); -#line 22225 "Photo.c" +#line 22240 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22232 "Photo.c" +#line 22247 "Photo.c" { PhotoRow* _tmp1_ = NULL; GeeHashMap* _tmp2_ = NULL; @@ -22247,88 +22262,88 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) { KeyValueMap* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; gboolean _tmp17_ = FALSE; -#line 2889 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2891 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2889 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2891 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->transformations; -#line 2889 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2891 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 22255 "Photo.c" +#line 22270 "Photo.c" PhotoRow* _tmp3_ = NULL; GeeHashMap* _tmp4_ = NULL; -#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_->transformations); -#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_->transformations = _tmp4_; -#line 22266 "Photo.c" +#line 22281 "Photo.c" } -#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->transformations; -#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = trans; -#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = key_value_map_get_group (_tmp7_); -#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = trans; -#line 2892 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2894 "/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 2892 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp9_); #line 2894 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp9_); +#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_table_get_instance (); -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_; -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->row; -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->photo_id; -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = trans; -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo_table_set_transformation (_tmp12_, &_tmp14_, _tmp15_); -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp12_); -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp17_; -#line 22302 "Photo.c" +#line 22317 "Photo.c" { PhotoRow* _tmp18_ = NULL; -#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->row; -#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22309 "Photo.c" +#line 22324 "Photo.c" } -#line 2894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2896 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22313 "Photo.c" +#line 22328 "Photo.c" } - __finally376: + __finally377: { PhotoRow* _tmp19_ = NULL; -#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22322 "Photo.c" +#line 22337 "Photo.c" } -#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2890 "/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 2888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2890 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 22330 "Photo.c" +#line 22345 "Photo.c" } } @@ -22340,18 +22355,18 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) { gboolean _tmp19_ = FALSE; gboolean _tmp20_ = FALSE; GError * _inner_error_ = NULL; -#line 2898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2900 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2900 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (name != NULL, FALSE); -#line 22346 "Photo.c" +#line 22361 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 2900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 2900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22353 "Photo.c" +#line 22368 "Photo.c" { PhotoRow* _tmp1_ = NULL; GeeHashMap* _tmp2_ = NULL; @@ -22361,13 +22376,13 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) { PhotoID _tmp15_ = {0}; const gchar* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; -#line 2901 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2903 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; -#line 2901 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2903 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->transformations; -#line 2901 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2903 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 22369 "Photo.c" +#line 22384 "Photo.c" PhotoRow* _tmp3_ = NULL; GeeHashMap* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; @@ -22376,111 +22391,111 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) { GeeHashMap* _tmp8_ = NULL; gint _tmp9_ = 0; gint _tmp10_ = 0; -#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2904 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2904 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->transformations; -#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2904 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = name; -#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2904 "/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 2902 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2904 "/home/jens/Source/shotwell/src/Photo.vala" altered_cache = _tmp6_; -#line 2903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2905 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 2903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2905 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->transformations; -#line 2903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2905 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_MAP, GeeMap)); -#line 2903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2905 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_; -#line 2903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2905 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_ == 0) { -#line 22398 "Photo.c" +#line 22413 "Photo.c" PhotoRow* _tmp11_ = NULL; -#line 2904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2906 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; -#line 2904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2906 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp11_->transformations); -#line 2904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2906 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_->transformations = NULL; -#line 22406 "Photo.c" +#line 22421 "Photo.c" } } else { -#line 2906 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2908 "/home/jens/Source/shotwell/src/Photo.vala" altered_cache = FALSE; -#line 22411 "Photo.c" +#line 22426 "Photo.c" } -#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_table_get_instance (); -#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->photo_id; -#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = name; -#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_table_remove_transformation (_tmp13_, &_tmp15_, _tmp16_); -#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" altered_persistent = _tmp17_; -#line 2909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp13_); -#line 22429 "Photo.c" +#line 22444 "Photo.c" } - __finally377: + __finally378: { PhotoRow* _tmp18_ = NULL; -#line 2900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->row; -#line 2900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22438 "Photo.c" +#line 22453 "Photo.c" } -#line 2900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2902 "/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 2900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 2900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2902 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 22448 "Photo.c" +#line 22463 "Photo.c" } } -#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = altered_cache; -#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp20_) { -#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = TRUE; -#line 22457 "Photo.c" +#line 22472 "Photo.c" } else { -#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = altered_persistent; -#line 22461 "Photo.c" +#line 22476 "Photo.c" } -#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp19_; -#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22467 "Photo.c" +#line 22482 "Photo.c" } gboolean photo_has_crop (Photo* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 2916 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2918 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2917 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2919 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_has_transformation (self, "crop"); -#line 2917 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2919 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 2917 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2919 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22482 "Photo.c" +#line 22497 "Photo.c" } @@ -22510,136 +22525,136 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { gint _tmp18_ = 0; gint _tmp19_ = 0; gint _tmp20_ = 0; -#line 2921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2923 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2922 "/home/jens/Source/shotwell/src/Photo.vala" - box_init (&_vala_crop, 0, 0, 0, 0); #line 2924 "/home/jens/Source/shotwell/src/Photo.vala" + box_init (&_vala_crop, 0, 0, 0, 0); +#line 2926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_transformation (self, "crop"); -#line 2924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2926 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 2925 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2927 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; -#line 2925 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2927 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 2926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2928 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2928 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2928 "/home/jens/Source/shotwell/src/Photo.vala" if (crop) { -#line 2926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2928 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22532 "Photo.c" +#line 22547 "Photo.c" } -#line 2926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2928 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22536 "Photo.c" +#line 22551 "Photo.c" } -#line 2928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map; -#line 2928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = key_value_map_get_int (_tmp2_, "left", -1); -#line 2928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" left = _tmp3_; -#line 2929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2931 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; -#line 2929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2931 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = key_value_map_get_int (_tmp4_, "top", -1); -#line 2929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2931 "/home/jens/Source/shotwell/src/Photo.vala" top = _tmp5_; -#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2932 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = map; -#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2932 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = key_value_map_get_int (_tmp6_, "right", -1); -#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2932 "/home/jens/Source/shotwell/src/Photo.vala" right = _tmp7_; -#line 2931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = map; -#line 2931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = key_value_map_get_int (_tmp8_, "bottom", -1); -#line 2931 "/home/jens/Source/shotwell/src/Photo.vala" - bottom = _tmp9_; #line 2933 "/home/jens/Source/shotwell/src/Photo.vala" + bottom = _tmp9_; +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = left; -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ == -1) { -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = TRUE; -#line 22568 "Photo.c" +#line 22583 "Photo.c" } else { gint _tmp14_ = 0; -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = top; -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp14_ == -1; -#line 22575 "Photo.c" +#line 22590 "Photo.c" } -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; -#line 22581 "Photo.c" +#line 22596 "Photo.c" } else { gint _tmp15_ = 0; -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = right; -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp15_ == -1; -#line 22588 "Photo.c" +#line 22603 "Photo.c" } -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = TRUE; -#line 22594 "Photo.c" +#line 22609 "Photo.c" } else { gint _tmp16_ = 0; -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = bottom; -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp16_ == -1; -#line 22601 "Photo.c" +#line 22616 "Photo.c" } -#line 2933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2935 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_) { -#line 2934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" if (crop) { -#line 2934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22613 "Photo.c" +#line 22628 "Photo.c" } -#line 2934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22617 "Photo.c" +#line 22632 "Photo.c" } -#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = left; -#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = top; -#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = right; -#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = bottom; -#line 2936 "/home/jens/Source/shotwell/src/Photo.vala" - box_init (&_vala_crop, _tmp17_, _tmp18_, _tmp19_, _tmp20_); #line 2938 "/home/jens/Source/shotwell/src/Photo.vala" + box_init (&_vala_crop, _tmp17_, _tmp18_, _tmp19_, _tmp20_); +#line 2940 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2940 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2940 "/home/jens/Source/shotwell/src/Photo.vala" if (crop) { -#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2940 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22637 "Photo.c" +#line 22652 "Photo.c" } -#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2940 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22641 "Photo.c" +#line 22656 "Photo.c" } @@ -22660,68 +22675,68 @@ static void photo_set_raw_crop (Photo* self, Box* crop) { gint _tmp12_ = 0; KeyValueMap* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; -#line 2942 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2944 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2942 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2944 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (crop != NULL); -#line 2943 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2945 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = key_value_map_new ("crop"); -#line 2943 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2945 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 2944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; -#line 2944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = *crop; -#line 2944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_.left; -#line 2944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp1_, "left", _tmp3_); -#line 2945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; -#line 2945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = *crop; -#line 2945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_.top; -#line 2945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp4_, "top", _tmp6_); -#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2948 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = map; -#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2948 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = *crop; -#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2948 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_.right; -#line 2946 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2948 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp7_, "right", _tmp9_); -#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = map; -#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = *crop; -#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_.bottom; -#line 2947 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_set_int (_tmp10_, "bottom", _tmp12_); #line 2949 "/home/jens/Source/shotwell/src/Photo.vala" + key_value_map_set_int (_tmp10_, "bottom", _tmp12_); +#line 2951 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = map; -#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2951 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo_set_transformation (self, _tmp13_); -#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2951 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_) { -#line 22708 "Photo.c" +#line 22723 "Photo.c" Alteration* _tmp15_ = NULL; Alteration* _tmp16_ = NULL; -#line 2950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2952 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = alteration_new ("image", "crop"); -#line 2950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2952 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 2950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2952 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_); -#line 2950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2952 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp16_); -#line 22719 "Photo.c" +#line 22734 "Photo.c" } -#line 2942 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2944 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 22723 "Photo.c" +#line 22738 "Photo.c" } @@ -22733,51 +22748,51 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) { KeyValueMap* _tmp1_ = NULL; KeyValueMap* _tmp2_ = NULL; gdouble _tmp3_ = 0.0; -#line 2953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2955 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2956 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_transformation (self, "straighten"); -#line 2954 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2956 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 2955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2957 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; -#line 2955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2957 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 2956 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_angle = 0.0; #line 2958 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_angle = 0.0; +#line 2960 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 2958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2960 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2960 "/home/jens/Source/shotwell/src/Photo.vala" if (angle) { -#line 2958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2960 "/home/jens/Source/shotwell/src/Photo.vala" *angle = _vala_angle; -#line 22755 "Photo.c" +#line 22770 "Photo.c" } -#line 2958 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2960 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22759 "Photo.c" +#line 22774 "Photo.c" } -#line 2961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map; -#line 2961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = key_value_map_get_double (_tmp2_, "angle", 0.0); -#line 2961 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_angle = _tmp3_; #line 2963 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_angle = _tmp3_; +#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 2963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" if (angle) { -#line 2963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" *angle = _vala_angle; -#line 22775 "Photo.c" +#line 22790 "Photo.c" } -#line 2963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2965 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22779 "Photo.c" +#line 22794 "Photo.c" } @@ -22788,40 +22803,40 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) { gdouble _tmp2_ = 0.0; KeyValueMap* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 2966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2968 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 2967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = key_value_map_new ("straighten"); -#line 2967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2969 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 2968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; -#line 2968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = theta; -#line 2968 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_set_double (_tmp1_, "angle", _tmp2_); #line 2970 "/home/jens/Source/shotwell/src/Photo.vala" + key_value_map_set_double (_tmp1_, "angle", _tmp2_); +#line 2972 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = map; -#line 2970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2972 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_set_transformation (self, _tmp3_); -#line 2970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2972 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_) { -#line 22808 "Photo.c" +#line 22823 "Photo.c" Alteration* _tmp5_ = NULL; Alteration* _tmp6_ = NULL; -#line 2971 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2973 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = alteration_new ("image", "straighten"); -#line 2971 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2973 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 2971 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2973 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp6_); -#line 2971 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2973 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp6_); -#line 22819 "Photo.c" +#line 22834 "Photo.c" } -#line 2966 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2968 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 22823 "Photo.c" +#line 22838 "Photo.c" } @@ -22843,81 +22858,81 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, GdkPoint _tmp9_ = {0}; EditingToolsRedeyeInstance* _tmp47_ = NULL; gint _tmp47__length1 = 0; -#line 2976 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2978 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 2977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_transformation (self, "redeye"); -#line 2977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 2978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; -#line 2978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2980 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 22855 "Photo.c" +#line 22870 "Photo.c" EditingToolsRedeyeInstance* _tmp2_ = NULL; EditingToolsRedeyeInstance* _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = g_new0 (EditingToolsRedeyeInstance, 0); -#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3__length1 = 0; -#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { -#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp3__length1; -#line 22869 "Photo.c" +#line 22884 "Photo.c" } -#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 2979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22877 "Photo.c" +#line 22892 "Photo.c" } -#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2983 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; -#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2983 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1); -#line 2981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2983 "/home/jens/Source/shotwell/src/Photo.vala" num_points = _tmp5_; -#line 2982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2984 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = num_points; -#line 2982 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp6_ > 0, "num_points > 0"); #line 2984 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_assert (_tmp6_ > 0, "num_points > 0"); +#line 2986 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = num_points; -#line 2984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2986 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_new0 (EditingToolsRedeyeInstance, _tmp7_); -#line 2984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2986 "/home/jens/Source/shotwell/src/Photo.vala" res = _tmp8_; -#line 2984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2986 "/home/jens/Source/shotwell/src/Photo.vala" res_length1 = _tmp7_; -#line 2984 "/home/jens/Source/shotwell/src/Photo.vala" - _res_size_ = res_length1; #line 2986 "/home/jens/Source/shotwell/src/Photo.vala" + _res_size_ = res_length1; +#line 2988 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_.x = 0; -#line 2986 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2988 "/home/jens/Source/shotwell/src/Photo.vala" default_point = _tmp9_; -#line 2987 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2989 "/home/jens/Source/shotwell/src/Photo.vala" default_point.x = -1; -#line 2988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" default_point.y = -1; -#line 22907 "Photo.c" +#line 22922 "Photo.c" { gint i = 0; -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" i = 0; -#line 22912 "Photo.c" +#line 22927 "Photo.c" { gboolean _tmp10_ = FALSE; -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = TRUE; -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 22919 "Photo.c" +#line 22934 "Photo.c" gint _tmp12_ = 0; gint _tmp13_ = 0; gchar* center_key = NULL; @@ -22960,158 +22975,158 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, gint _tmp44_ = 0; EditingToolsRedeyeInstance _tmp45_ = {0}; gint _tmp46_ = 0; -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp10_) { -#line 22964 "Photo.c" +#line 22979 "Photo.c" gint _tmp11_ = 0; -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = i; -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" i = _tmp11_ + 1; -#line 22970 "Photo.c" +#line 22985 "Photo.c" } -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = FALSE; -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = i; -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = num_points; -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp12_ < _tmp13_)) { -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 22982 "Photo.c" +#line 22997 "Photo.c" } -#line 2991 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2993 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = i; -#line 2991 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2993 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = g_strdup_printf ("center%d", _tmp14_); -#line 2991 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2993 "/home/jens/Source/shotwell/src/Photo.vala" center_key = _tmp15_; -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = i; -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = g_strdup_printf ("radius%d", _tmp16_); -#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" - radius_key = _tmp17_; #line 2994 "/home/jens/Source/shotwell/src/Photo.vala" + radius_key = _tmp17_; +#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = res; -#line 2994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18__length1 = res_length1; -#line 2994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = i; -#line 2994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = map; -#line 2994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = center_key; -#line 2994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = default_point; -#line 2994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_get_point (_tmp20_, _tmp21_, &_tmp22_, &_tmp23_); -#line 2994 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_[_tmp19_].center = _tmp23_; -#line 2995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = res; -#line 2995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24__length1 = res_length1; -#line 2995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = i; -#line 2995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp24_[_tmp25_]; -#line 2995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_.center; -#line 2995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_.x; -#line 2995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = default_point; -#line 2995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_.x; -#line 2995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2997 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp28_ != _tmp30_, "res[i].center.x != default_point.x"); -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = res; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31__length1 = res_length1; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = i; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp31_[_tmp32_]; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_.center; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_.y; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = default_point; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_.y; -#line 2996 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp35_ != _tmp37_, "res[i].center.y != default_point.y"); #line 2998 "/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" _tmp38_ = res; -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38__length1 = res_length1; -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = i; -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = map; -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = radius_key; -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = key_value_map_get_int (_tmp40_, _tmp41_, -1); -#line 2998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_[_tmp39_].radius = _tmp42_; -#line 2999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = res; -#line 2999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43__length1 = res_length1; -#line 2999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = i; -#line 2999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp43_[_tmp44_]; -#line 2999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = _tmp45_.radius; -#line 2999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3001 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp46_ != -1, "res[i].radius != -1"); -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (radius_key); -#line 2990 "/home/jens/Source/shotwell/src/Photo.vala" +#line 2992 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (center_key); -#line 23078 "Photo.c" +#line 23093 "Photo.c" } } } -#line 3002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = res; -#line 3002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47__length1 = res_length1; -#line 3002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { -#line 3002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp47__length1; -#line 23090 "Photo.c" +#line 23105 "Photo.c" } -#line 3002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp47_; -#line 3002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 3002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3004 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23098 "Photo.c" +#line 23113 "Photo.c" } gboolean photo_has_redeye_transformations (Photo* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 3005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3007 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 3006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3008 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_has_transformation (self, "redeye"); -#line 3006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3008 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 3006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3008 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23113 "Photo.c" +#line 23128 "Photo.c" } @@ -23142,111 +23157,111 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) gint _tmp21_ = 0; KeyValueMap* _tmp22_ = NULL; gboolean _tmp23_ = FALSE; -#line 3010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (redeye != NULL); -#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3013 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_transformation (self, "redeye"); -#line 3011 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3013 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; -#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3014 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 23156 "Photo.c" +#line 23171 "Photo.c" KeyValueMap* _tmp2_ = NULL; KeyValueMap* _tmp3_ = NULL; -#line 3013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = key_value_map_new ("redeye"); -#line 3013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 3013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3015 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp2_; -#line 3014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = map; -#line 3014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3016 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp3_, "num_points", 0); -#line 23169 "Photo.c" +#line 23184 "Photo.c" } -#line 3017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; -#line 3017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1); -#line 3017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" num_points = _tmp5_; -#line 3018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = num_points; -#line 3018 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp6_ >= 0, "num_points >= 0"); #line 3020 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_assert (_tmp6_ >= 0, "num_points >= 0"); +#line 3022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = num_points; -#line 3020 "/home/jens/Source/shotwell/src/Photo.vala" - num_points = _tmp7_ + 1; #line 3022 "/home/jens/Source/shotwell/src/Photo.vala" + num_points = _tmp7_ + 1; +#line 3024 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = num_points; -#line 3022 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3024 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = g_strdup_printf ("radius%d", _tmp8_ - 1); -#line 3022 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3024 "/home/jens/Source/shotwell/src/Photo.vala" radius_key = _tmp9_; -#line 3023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3025 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = num_points; -#line 3023 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3025 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = g_strdup_printf ("center%d", _tmp10_ - 1); -#line 3023 "/home/jens/Source/shotwell/src/Photo.vala" - center_key = _tmp11_; #line 3025 "/home/jens/Source/shotwell/src/Photo.vala" + center_key = _tmp11_; +#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = map; -#line 3025 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = radius_key; -#line 3025 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = *redeye; -#line 3025 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_.radius; -#line 3025 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp12_, _tmp13_, _tmp15_); -#line 3026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = map; -#line 3026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = center_key; -#line 3026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = *redeye; -#line 3026 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_.center; -#line 3026 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_set_point (_tmp16_, _tmp17_, &_tmp19_); #line 3028 "/home/jens/Source/shotwell/src/Photo.vala" + key_value_map_set_point (_tmp16_, _tmp17_, &_tmp19_); +#line 3030 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = map; -#line 3028 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3030 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = num_points; -#line 3028 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_set_int (_tmp20_, "num_points", _tmp21_); #line 3030 "/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" _tmp22_ = map; -#line 3030 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo_set_transformation (self, _tmp22_); -#line 3030 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3032 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_) { -#line 23229 "Photo.c" +#line 23244 "Photo.c" Alteration* _tmp24_ = NULL; Alteration* _tmp25_ = NULL; -#line 3031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = alteration_new ("image", "redeye"); -#line 3031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_; -#line 3031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3033 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); -#line 3031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3033 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp25_); -#line 23240 "Photo.c" +#line 23255 "Photo.c" } -#line 3010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (center_key); -#line 3010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (radius_key); -#line 3010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3012 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 23248 "Photo.c" +#line 23263 "Photo.c" } @@ -23255,89 +23270,89 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling Dimensions _vala_scaled_to_viewport = {0}; gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 3045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 3045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, FALSE); -#line 23261 "Photo.c" +#line 23276 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 23268 "Photo.c" +#line 23283 "Photo.c" { Scaling _tmp1_ = {0}; PhotoException _tmp2_ = 0; Dimensions _tmp3_ = {0}; Dimensions _tmp4_ = {0}; gboolean _tmp5_ = FALSE; -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = exceptions; -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_locked_calculate_pixbuf_dimensions (self, &_tmp1_, _tmp2_, &_tmp3_, &_tmp4_); -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp3_; -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_to_viewport = _tmp4_; -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 23287 "Photo.c" +#line 23302 "Photo.c" { PhotoRow* _tmp6_ = NULL; -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 23294 "Photo.c" +#line 23309 "Photo.c" } -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23300 "Photo.c" +#line 23315 "Photo.c" } -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23306 "Photo.c" +#line 23321 "Photo.c" } -#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23310 "Photo.c" +#line 23325 "Photo.c" } - __finally378: + __finally379: { PhotoRow* _tmp7_ = NULL; -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 23319 "Photo.c" +#line 23334 "Photo.c" } -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3049 "/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 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3049 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 23327 "Photo.c" +#line 23342 "Photo.c" } -#line 3045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { -#line 3045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23333 "Photo.c" +#line 23348 "Photo.c" } -#line 3045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { -#line 3045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3047 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23339 "Photo.c" +#line 23354 "Photo.c" } } @@ -23361,72 +23376,72 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* gint _tmp57_ = 0; gboolean _tmp63_ = FALSE; gboolean _tmp64_ = FALSE; -#line 3055 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3057 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 3055 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (scaling != NULL, FALSE); #line 3057 "/home/jens/Source/shotwell/src/Photo.vala" + g_return_val_if_fail (scaling != NULL, FALSE); +#line 3059 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_raw_dimensions (self, &_tmp0_); -#line 3057 "/home/jens/Source/shotwell/src/Photo.vala" - raw = _tmp0_; #line 3059 "/home/jens/Source/shotwell/src/Photo.vala" + raw = _tmp0_; +#line 3061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = scaling_is_unscaled (scaling); -#line 3059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3061 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 23375 "Photo.c" +#line 23390 "Photo.c" Dimensions _tmp2_ = {0}; Dimensions _tmp3_ = {0}; -#line 3060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3062 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = raw; -#line 3060 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3062 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp2_; -#line 3061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3063 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = raw; -#line 3061 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_to_viewport = _tmp3_; #line 3063 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_scaled_to_viewport = _tmp3_; +#line 3065 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 3063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3065 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { -#line 3063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3065 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23392 "Photo.c" +#line 23407 "Photo.c" } -#line 3063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3065 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { -#line 3063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3065 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23398 "Photo.c" +#line 23413 "Photo.c" } -#line 3063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3065 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23402 "Photo.c" +#line 23417 "Photo.c" } -#line 3066 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_orientation (self); -#line 3066 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3068 "/home/jens/Source/shotwell/src/Photo.vala" orientation = _tmp4_; -#line 3071 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3073 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&_vala_scaled_image, 0, 0); -#line 3072 "/home/jens/Source/shotwell/src/Photo.vala" - dimensions_init (&_vala_scaled_to_viewport, 0, 0); #line 3074 "/home/jens/Source/shotwell/src/Photo.vala" + dimensions_init (&_vala_scaled_to_viewport, 0, 0); +#line 3076 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = exceptions; -#line 3074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3076 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_exception_allows (_tmp5_, PHOTO_EXCEPTION_CROP); -#line 3074 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3076 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 23418 "Photo.c" +#line 23433 "Photo.c" Box crop = {0}; Box _tmp7_ = {0}; gboolean _tmp8_ = FALSE; -#line 3076 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3078 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_get_raw_crop (self, &_tmp7_); -#line 3076 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3078 "/home/jens/Source/shotwell/src/Photo.vala" crop = _tmp7_; -#line 3076 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3078 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 23428 "Photo.c" +#line 23443 "Photo.c" Dimensions rotated_raw = {0}; Dimensions _tmp9_ = {0}; PhotoException _tmp10_ = 0; @@ -23444,17 +23459,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* Dimensions _tmp32_ = {0}; PhotoException _tmp33_ = 0; gboolean _tmp34_ = FALSE; -#line 3079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3081 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = raw; -#line 3079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3081 "/home/jens/Source/shotwell/src/Photo.vala" rotated_raw = _tmp9_; -#line 3080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = exceptions; -#line 3080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_ORIENTATION); -#line 3080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3082 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 23456 "Photo.c" +#line 23471 "Photo.c" Orientation _tmp12_ = 0; Dimensions _tmp13_ = {0}; Box _tmp14_ = {0}; @@ -23462,125 +23477,125 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* Orientation _tmp16_ = 0; Dimensions _tmp17_ = {0}; Dimensions _tmp18_ = {0}; -#line 3081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3083 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = orientation; -#line 3081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3083 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = raw; -#line 3081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3083 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = crop; -#line 3081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3083 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_box (_tmp12_, &_tmp13_, &_tmp14_, &_tmp15_); -#line 3081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3083 "/home/jens/Source/shotwell/src/Photo.vala" crop = _tmp15_; -#line 3082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = orientation; -#line 3082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = raw; -#line 3082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_dimensions (_tmp16_, &_tmp17_, &_tmp18_); -#line 3082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3084 "/home/jens/Source/shotwell/src/Photo.vala" rotated_raw = _tmp18_; -#line 23482 "Photo.c" +#line 23497 "Photo.c" } -#line 3086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3088 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&crop, &_tmp19_); -#line 3086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3088 "/home/jens/Source/shotwell/src/Photo.vala" scaling_get_scaled_dimensions (scaling, &_tmp19_, &_tmp20_); -#line 3086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3088 "/home/jens/Source/shotwell/src/Photo.vala" box_get_scaled (&crop, &_tmp20_, &_tmp21_); -#line 3086 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3088 "/home/jens/Source/shotwell/src/Photo.vala" scaled_crop = _tmp21_; -#line 3089 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3091 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&scaled_crop, &_tmp22_); -#line 3089 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3091 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_to_viewport = _tmp22_; -#line 3092 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = box_get_width (&crop); -#line 3092 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = box_get_width (&scaled_crop); -#line 3092 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3094 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_ <= _tmp25_) { -#line 23502 "Photo.c" +#line 23517 "Photo.c" gint _tmp26_ = 0; gint _tmp27_ = 0; -#line 3093 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = box_get_height (&crop); -#line 3093 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = box_get_height (&scaled_crop); -#line 3093 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp26_ <= _tmp27_; -#line 23511 "Photo.c" +#line 23526 "Photo.c" } else { -#line 3092 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = FALSE; -#line 23515 "Photo.c" +#line 23530 "Photo.c" } -#line 3092 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3094 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_) { -#line 23519 "Photo.c" +#line 23534 "Photo.c" Dimensions _tmp28_ = {0}; Dimensions _tmp29_ = {0}; -#line 3094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3096 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = raw; -#line 3094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3096 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp28_; -#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3097 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&crop, &_tmp29_); -#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_to_viewport = _tmp29_; #line 3097 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_scaled_to_viewport = _tmp29_; +#line 3099 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 3097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3099 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { -#line 3097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3099 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23536 "Photo.c" +#line 23551 "Photo.c" } -#line 3097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3099 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { -#line 3097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3099 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23542 "Photo.c" +#line 23557 "Photo.c" } -#line 3097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3099 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23546 "Photo.c" +#line 23561 "Photo.c" } -#line 3102 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3104 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&crop, &_tmp30_); -#line 3102 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3104 "/home/jens/Source/shotwell/src/Photo.vala" box_get_dimensions (&scaled_crop, &_tmp31_); -#line 3102 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3104 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_get_scaled_similar (&rotated_raw, &_tmp30_, &_tmp31_, &_tmp32_); -#line 3102 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3104 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp32_; -#line 3106 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3108 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = exceptions; -#line 3106 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3108 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = photo_exception_allows (_tmp33_, PHOTO_EXCEPTION_ORIENTATION); -#line 3106 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3108 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp34_) { -#line 23562 "Photo.c" +#line 23577 "Photo.c" Orientation _tmp35_ = 0; Dimensions _tmp36_ = {0}; Dimensions _tmp37_ = {0}; -#line 3107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3109 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = orientation; -#line 3107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3109 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = _vala_scaled_image; -#line 3107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3109 "/home/jens/Source/shotwell/src/Photo.vala" orientation_derotate_dimensions (_tmp35_, &_tmp36_, &_tmp37_); -#line 3107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3109 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp37_; -#line 23574 "Photo.c" +#line 23589 "Photo.c" } } } -#line 3112 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3114 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = dimensions_has_area (&_vala_scaled_image); -#line 3112 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3114 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp38_) { -#line 23582 "Photo.c" +#line 23597 "Photo.c" Dimensions rotated_raw = {0}; Dimensions _tmp39_ = {0}; PhotoException _tmp40_ = 0; @@ -23590,143 +23605,143 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* Dimensions _tmp47_ = {0}; PhotoException _tmp48_ = 0; gboolean _tmp49_ = FALSE; -#line 3114 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3116 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = raw; -#line 3114 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3116 "/home/jens/Source/shotwell/src/Photo.vala" rotated_raw = _tmp39_; -#line 3115 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3117 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = exceptions; -#line 3115 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3117 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_ORIENTATION); -#line 3115 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3117 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 23602 "Photo.c" +#line 23617 "Photo.c" Orientation _tmp42_ = 0; Dimensions _tmp43_ = {0}; Dimensions _tmp44_ = {0}; -#line 3116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = orientation; -#line 3116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = raw; -#line 3116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_dimensions (_tmp42_, &_tmp43_, &_tmp44_); -#line 3116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" rotated_raw = _tmp44_; -#line 23614 "Photo.c" +#line 23629 "Photo.c" } -#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3120 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = rotated_raw; -#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3120 "/home/jens/Source/shotwell/src/Photo.vala" scaling_get_scaled_dimensions (scaling, &_tmp45_, &_tmp46_); -#line 3118 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3120 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp46_; -#line 3119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3121 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _vala_scaled_image; -#line 3119 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3121 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_to_viewport = _tmp47_; -#line 3122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3124 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = exceptions; -#line 3122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3124 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = photo_exception_allows (_tmp48_, PHOTO_EXCEPTION_ORIENTATION); -#line 3122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3124 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_) { -#line 23632 "Photo.c" +#line 23647 "Photo.c" Orientation _tmp50_ = 0; Dimensions _tmp51_ = {0}; Dimensions _tmp52_ = {0}; -#line 3123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3125 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = orientation; -#line 3123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3125 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = _vala_scaled_image; -#line 3123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3125 "/home/jens/Source/shotwell/src/Photo.vala" orientation_derotate_dimensions (_tmp50_, &_tmp51_, &_tmp52_); -#line 3123 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3125 "/home/jens/Source/shotwell/src/Photo.vala" _vala_scaled_image = _tmp52_; -#line 23644 "Photo.c" +#line 23659 "Photo.c" } } -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = _vala_scaled_image; -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _tmp54_.width; -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = raw; -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = _tmp56_.width; -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp55_ >= _tmp57_) { -#line 23657 "Photo.c" +#line 23672 "Photo.c" Dimensions _tmp58_ = {0}; gint _tmp59_ = 0; Dimensions _tmp60_ = {0}; gint _tmp61_ = 0; -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = _vala_scaled_image; -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = _tmp58_.height; -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = raw; -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _tmp60_.height; -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp59_ >= _tmp61_; -#line 23672 "Photo.c" +#line 23687 "Photo.c" } else { -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = FALSE; -#line 23676 "Photo.c" +#line 23691 "Photo.c" } -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3129 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp53_) { -#line 23680 "Photo.c" +#line 23695 "Photo.c" Dimensions _tmp62_ = {0}; -#line 3128 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3130 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = raw; -#line 3128 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp62_; #line 3130 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_scaled_image = _tmp62_; +#line 3132 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 3130 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3132 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { -#line 3130 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3132 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23692 "Photo.c" +#line 23707 "Photo.c" } -#line 3130 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3132 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { -#line 3130 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3132 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23698 "Photo.c" +#line 23713 "Photo.c" } -#line 3130 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3132 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23702 "Photo.c" +#line 23717 "Photo.c" } -#line 3133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = dimensions_has_area (&_vala_scaled_image); -#line 3133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3135 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp63_, "scaled_image.has_area()"); -#line 3134 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = dimensions_has_area (&_vala_scaled_to_viewport); -#line 3134 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp64_, "scaled_to_viewport.has_area()"); #line 3136 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_assert (_tmp64_, "scaled_to_viewport.has_area()"); +#line 3138 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3138 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { -#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3138 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23718 "Photo.c" +#line 23733 "Photo.c" } -#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3138 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { -#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3138 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23724 "Photo.c" +#line 23739 "Photo.c" } -#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3138 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23728 "Photo.c" +#line 23743 "Photo.c" } @@ -23754,141 +23769,141 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc Dimensions _tmp22_ = {0}; gboolean _tmp23_ = FALSE; GError * _inner_error_ = NULL; -#line 3142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3144 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3144 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 3145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3147 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = fetch_mode; -#line 3145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3147 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_backing_reader (self, _tmp0_); -#line 3145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3147 "/home/jens/Source/shotwell/src/Photo.vala" loader = _tmp1_; -#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3150 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = scaling_is_unscaled (scaling); -#line 3148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3150 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 23770 "Photo.c" +#line 23785 "Photo.c" GdkPixbuf* _tmp3_ = NULL; PhotoFileReader* _tmp4_ = NULL; GdkPixbuf* _tmp5_ = NULL; GdkPixbuf* _tmp6_ = NULL; -#line 3153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = loader; -#line 3153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_file_reader_unscaled_read (_tmp4_, &_inner_error_); -#line 3153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp5_; -#line 3153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); -#line 3153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 23789 "Photo.c" +#line 23804 "Photo.c" } -#line 3153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp3_; -#line 3153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = NULL; -#line 3153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp6_; -#line 3153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 3153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); -#line 3153 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23803 "Photo.c" +#line 23818 "Photo.c" } -#line 3158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3160 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = *scaling; -#line 3158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3160 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = exceptions; -#line 3158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3160 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_calculate_pixbuf_dimensions (self, &_tmp7_, _tmp8_, &_tmp9_, &_tmp10_); -#line 3158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3160 "/home/jens/Source/shotwell/src/Photo.vala" scaled_image = _tmp9_; -#line 3158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3160 "/home/jens/Source/shotwell/src/Photo.vala" scaled_to_viewport = _tmp10_; -#line 3158 "/home/jens/Source/shotwell/src/Photo.vala" - is_scaled = _tmp11_; #line 3160 "/home/jens/Source/shotwell/src/Photo.vala" + is_scaled = _tmp11_; +#line 3162 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = is_scaled; -#line 3160 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3162 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp12_) { -#line 23821 "Photo.c" +#line 23836 "Photo.c" GdkPixbuf* _tmp13_ = NULL; PhotoFileReader* _tmp14_ = NULL; GdkPixbuf* _tmp15_ = NULL; GdkPixbuf* _tmp16_ = NULL; -#line 3165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = loader; -#line 3165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_file_reader_unscaled_read (_tmp14_, &_inner_error_); -#line 3165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp15_; -#line 3165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); -#line 3165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 23840 "Photo.c" +#line 23855 "Photo.c" } -#line 3165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp13_; -#line 3165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = NULL; -#line 3165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp16_; -#line 3165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp13_); -#line 3165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); -#line 3165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3167 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23854 "Photo.c" +#line 23869 "Photo.c" } -#line 3168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = loader; -#line 3168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_raw_dimensions (self, &_tmp18_); -#line 3168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = scaled_image; -#line 3168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo_file_reader_scaled_read (_tmp17_, &_tmp18_, &_tmp19_, &_inner_error_); -#line 3168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp20_; -#line 3168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); -#line 3168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3170 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 23874 "Photo.c" +#line 23889 "Photo.c" } -#line 3176 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3178 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = pixbuf; -#line 3176 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3178 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_for_pixbuf (_tmp21_, &_tmp22_); -#line 3176 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3178 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = dimensions_approx_equals (&scaled_image, &_tmp22_, PHOTO_SCALING_FUDGE); -#line 3176 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp23_, "scaled_image.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)"); #line 3178 "/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" result = pixbuf; -#line 3178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3180 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); -#line 3178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3180 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23890 "Photo.c" +#line 23905 "Photo.c" } @@ -23900,37 +23915,37 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota GdkPixbuf* _tmp3_ = NULL; GdkPixbuf* _tmp4_ = NULL; GError * _inner_error_ = NULL; -#line 3183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3185 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3183 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3185 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 3184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; -#line 3184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = rotate; -#line 3184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_MASTER, &_inner_error_); -#line 3184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 3184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 23920 "Photo.c" +#line 23935 "Photo.c" } -#line 3184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp0_; -#line 3184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 3184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 3184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 3184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3186 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23932 "Photo.c" +#line 23947 "Photo.c" } @@ -23942,37 +23957,37 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean GdkPixbuf* _tmp3_ = NULL; GdkPixbuf* _tmp4_ = NULL; GError * _inner_error_ = NULL; -#line 3188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3190 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3190 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; -#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = rotate; -#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_UNMODIFIED, &_inner_error_); -#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 23962 "Photo.c" +#line 23977 "Photo.c" } -#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp0_; -#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 3189 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3191 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23974 "Photo.c" +#line 23989 "Photo.c" } @@ -23987,93 +24002,93 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, GdkPixbuf* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; GError * _inner_error_ = NULL; -#line 3193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3195 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3195 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 23993 "Photo.c" +#line 24008 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 3207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 3207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 24000 "Photo.c" +#line 24015 "Photo.c" { Scaling _tmp1_ = {0}; Dimensions _tmp2_ = {0}; Dimensions _tmp3_ = {0}; Orientation _tmp4_ = 0; -#line 3208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; -#line 3208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" photo_calculate_pixbuf_dimensions (self, &_tmp1_, PHOTO_EXCEPTION_NONE, &_tmp2_, &_tmp3_); -#line 3208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" scaled_image = _tmp2_; -#line 3208 "/home/jens/Source/shotwell/src/Photo.vala" - scaled_to_viewport = _tmp3_; #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" + scaled_to_viewport = _tmp3_; +#line 3212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_original_orientation (self); -#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3212 "/home/jens/Source/shotwell/src/Photo.vala" original_orientation = _tmp4_; -#line 24018 "Photo.c" +#line 24033 "Photo.c" } - __finally379: + __finally380: { PhotoRow* _tmp5_ = NULL; -#line 3207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; -#line 3207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 24027 "Photo.c" +#line 24042 "Photo.c" } -#line 3207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3209 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24035 "Photo.c" +#line 24050 "Photo.c" } } -#line 3214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = *scaling; -#line 3214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = fetch_mode; -#line 3214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_load_raw_pixbuf (self, &_tmp6_, PHOTO_EXCEPTION_NONE, _tmp7_, &_inner_error_); -#line 3214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp8_; -#line 3214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3216 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24052 "Photo.c" +#line 24067 "Photo.c" } -#line 3220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = rotate; -#line 3220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3222 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp9_) { -#line 24058 "Photo.c" +#line 24073 "Photo.c" GdkPixbuf* _tmp10_ = NULL; GdkPixbuf* _tmp11_ = NULL; -#line 3221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = pixbuf; -#line 3221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3223 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = orientation_rotate_pixbuf (original_orientation, _tmp10_); -#line 3221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3223 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3221 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3223 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp11_; -#line 24069 "Photo.c" +#line 24084 "Photo.c" } -#line 3230 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3232 "/home/jens/Source/shotwell/src/Photo.vala" result = pixbuf; -#line 3230 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3232 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24075 "Photo.c" +#line 24090 "Photo.c" } @@ -24085,35 +24100,35 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE GdkPixbuf* _tmp2_ = NULL; GdkPixbuf* _tmp3_ = NULL; GError * _inner_error_ = NULL; -#line 3233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3235 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 3233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3235 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 3234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; -#line 3234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3236 "/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 3234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp2_; -#line 3234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24103 "Photo.c" +#line 24118 "Photo.c" } -#line 3234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp0_; -#line 3234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 3234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 3234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 3234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3236 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24115 "Photo.c" +#line 24130 "Photo.c" } @@ -24133,34 +24148,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 3269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3271 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_cached_pixbuf_ref (self) : NULL; -#line 24137 "Photo.c" +#line 24152 "Photo.c" } static gboolean _photo_trim_source_pixbuf_cache_gsource_func (gpointer self) { gboolean result; result = photo_trim_source_pixbuf_cache (); -#line 3321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3323 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24146 "Photo.c" +#line 24161 "Photo.c" } static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, GError** error) { GdkPixbuf* result = NULL; GError * _inner_error_ = NULL; -#line 3252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3254 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((locate == NULL) || IS_PHOTO (locate), NULL); -#line 24155 "Photo.c" +#line 24170 "Photo.c" { GeeLinkedList* _tmp0_ = NULL; -#line 3253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_source_pixbuf_cache; -#line 3253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&__lock_photo_source_pixbuf_cache); -#line 24162 "Photo.c" +#line 24177 "Photo.c" { PhotoCachedPixbuf* found = NULL; gdouble min_elapsed = 0.0; @@ -24180,21 +24195,21 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G GdkPixbuf* _tmp69_ = NULL; PhotoCachedPixbuf* _tmp70_ = NULL; GdkPixbuf* _tmp73_ = NULL; -#line 3254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3256 "/home/jens/Source/shotwell/src/Photo.vala" found = NULL; -#line 3258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3260 "/home/jens/Source/shotwell/src/Photo.vala" min_elapsed = DBL_MAX; -#line 3259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3261 "/home/jens/Source/shotwell/src/Photo.vala" count = 0; -#line 3260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3262 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_source_pixbuf_cache; -#line 3260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3262 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 3260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3262 "/home/jens/Source/shotwell/src/Photo.vala" iter = _tmp2_; -#line 3261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3263 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 24196 "Photo.c" +#line 24211 "Photo.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; PhotoCachedPixbuf* cached_pixbuf = NULL; @@ -24207,236 +24222,236 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G gdouble _tmp10_ = 0.0; gboolean _tmp11_ = FALSE; Photo* _tmp12_ = NULL; -#line 3261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = iter; -#line 3261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 3261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3263 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp4_) { -#line 3261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3263 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 24217 "Photo.c" +#line 24232 "Photo.c" } -#line 3262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = iter; -#line 3262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 3262 "/home/jens/Source/shotwell/src/Photo.vala" - cached_pixbuf = (PhotoCachedPixbuf*) _tmp6_; #line 3264 "/home/jens/Source/shotwell/src/Photo.vala" + cached_pixbuf = (PhotoCachedPixbuf*) _tmp6_; +#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = cached_pixbuf; -#line 3264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->last_touched; -#line 3264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = g_timer_elapsed (_tmp8_, NULL); -#line 3264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = trunc (_tmp9_); -#line 3264 "/home/jens/Source/shotwell/src/Photo.vala" - elapsed = _tmp10_ + 1; #line 3266 "/home/jens/Source/shotwell/src/Photo.vala" + elapsed = _tmp10_ + 1; +#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = locate; -#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_ != NULL) { -#line 24239 "Photo.c" +#line 24254 "Photo.c" PhotoCachedPixbuf* _tmp13_ = NULL; Photo* _tmp14_ = NULL; Photo* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; -#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = cached_pixbuf; -#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->photo; -#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = locate; -#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3268 "/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 3266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp16_; -#line 24254 "Photo.c" +#line 24269 "Photo.c" } else { -#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; -#line 24258 "Photo.c" +#line 24273 "Photo.c" } -#line 3266 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 24262 "Photo.c" +#line 24277 "Photo.c" GeeIterator* _tmp17_ = NULL; PhotoCachedPixbuf* _tmp18_ = NULL; PhotoCachedPixbuf* _tmp19_ = NULL; gint _tmp20_ = 0; -#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = iter; -#line 3268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3270 "/home/jens/Source/shotwell/src/Photo.vala" gee_iterator_remove (_tmp17_); -#line 3269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = cached_pixbuf; -#line 3269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _photo_cached_pixbuf_ref0 (_tmp18_); -#line 3269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3271 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 3269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3271 "/home/jens/Source/shotwell/src/Photo.vala" found = _tmp19_; -#line 3272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = count; -#line 3272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" count = _tmp20_ + 1; -#line 24283 "Photo.c" +#line 24298 "Photo.c" } else { gdouble _tmp21_ = 0.0; -#line 3273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = elapsed; -#line 3273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3275 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_ >= ((gdouble) PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC)) { -#line 24290 "Photo.c" +#line 24305 "Photo.c" GeeIterator* _tmp22_ = NULL; -#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = iter; -#line 3274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3276 "/home/jens/Source/shotwell/src/Photo.vala" gee_iterator_remove (_tmp22_); -#line 24296 "Photo.c" +#line 24311 "Photo.c" } else { gint _tmp23_ = 0; -#line 3275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3277 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = count; -#line 3275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3277 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp23_ >= PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT) { -#line 24303 "Photo.c" +#line 24318 "Photo.c" GeeIterator* _tmp24_ = NULL; -#line 3276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3278 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = iter; -#line 3276 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3278 "/home/jens/Source/shotwell/src/Photo.vala" gee_iterator_remove (_tmp24_); -#line 24309 "Photo.c" +#line 24324 "Photo.c" } else { gdouble _tmp25_ = 0.0; gdouble _tmp26_ = 0.0; gdouble _tmp27_ = 0.0; gint _tmp28_ = 0; -#line 3280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = elapsed; -#line 3280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = min_elapsed; -#line 3280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = MIN (_tmp25_, _tmp26_); -#line 3280 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" min_elapsed = _tmp27_; -#line 3281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = count; -#line 3281 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3283 "/home/jens/Source/shotwell/src/Photo.vala" count = _tmp28_ + 1; -#line 24327 "Photo.c" +#line 24342 "Photo.c" } } } -#line 3261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3263 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (cached_pixbuf); -#line 24333 "Photo.c" +#line 24348 "Photo.c" } -#line 3286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = found; -#line 3286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp31_ == NULL) { -#line 24339 "Photo.c" +#line 24354 "Photo.c" Photo* _tmp32_ = NULL; -#line 3286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = locate; -#line 3286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp32_ != NULL; -#line 24345 "Photo.c" +#line 24360 "Photo.c" } else { -#line 3286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = FALSE; -#line 24349 "Photo.c" +#line 24364 "Photo.c" } -#line 3286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp30_) { -#line 24353 "Photo.c" +#line 24368 "Photo.c" gboolean _tmp33_ = FALSE; -#line 3286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = keep; -#line 3286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp33_; -#line 24359 "Photo.c" +#line 24374 "Photo.c" } else { -#line 3286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = FALSE; -#line 24363 "Photo.c" +#line 24378 "Photo.c" } -#line 3286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_) { -#line 24367 "Photo.c" +#line 24382 "Photo.c" GdkPixbuf* _tmp34_ = NULL; Photo* _tmp35_ = NULL; Scaling _tmp36_ = {0}; GdkPixbuf* _tmp37_ = NULL; Photo* _tmp38_ = NULL; PhotoCachedPixbuf* _tmp39_ = NULL; -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = locate; -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" scaling_for_original (&_tmp36_); -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = photo_load_raw_pixbuf (_tmp35_, &_tmp36_, PHOTO_EXCEPTION_ALL, BACKING_FETCH_MODE_SOURCE, &_inner_error_); -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp37_; -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (iter); -#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3290 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 24388 "Photo.c" - goto __finally380; +#line 24403 "Photo.c" + goto __finally381; } -#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = locate; -#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = photo_cached_pixbuf_new (_tmp38_, _tmp34_); -#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3289 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3289 "/home/jens/Source/shotwell/src/Photo.vala" found = _tmp39_; -#line 3286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3288 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp34_); -#line 24401 "Photo.c" +#line 24416 "Photo.c" } else { PhotoCachedPixbuf* _tmp40_ = NULL; -#line 3289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = found; -#line 3289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3291 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp40_ != NULL) { -#line 24408 "Photo.c" +#line 24423 "Photo.c" PhotoCachedPixbuf* _tmp41_ = NULL; GTimer* _tmp42_ = NULL; -#line 3291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = found; -#line 3291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_->last_touched; -#line 3291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3293 "/home/jens/Source/shotwell/src/Photo.vala" g_timer_start (_tmp42_); -#line 24417 "Photo.c" +#line 24432 "Photo.c" } } -#line 3295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = found; -#line 3295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp44_ != NULL) { -#line 24424 "Photo.c" +#line 24439 "Photo.c" gboolean _tmp45_ = FALSE; -#line 3295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = keep; -#line 3295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp45_; -#line 24430 "Photo.c" +#line 24445 "Photo.c" } else { -#line 3295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = FALSE; -#line 24434 "Photo.c" +#line 24449 "Photo.c" } -#line 3295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3297 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp43_) { -#line 24438 "Photo.c" +#line 24453 "Photo.c" GeeLinkedList* _tmp46_ = NULL; PhotoCachedPixbuf* _tmp47_ = NULL; PhotoCachedPixbuf* _tmp48_ = NULL; @@ -24444,157 +24459,157 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G gdouble _tmp50_ = 0.0; gdouble _tmp51_ = 0.0; gdouble _tmp52_ = 0.0; -#line 3296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3298 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = photo_source_pixbuf_cache; -#line 3296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3298 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = found; -#line 3296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3298 "/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 3301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = found; -#line 3301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = _tmp48_->last_touched; -#line 3301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = g_timer_elapsed (_tmp49_, NULL); -#line 3301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = min_elapsed; -#line 3301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = MIN (_tmp50_, _tmp51_); -#line 3301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3303 "/home/jens/Source/shotwell/src/Photo.vala" min_elapsed = _tmp52_; -#line 3305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 24466 "Photo.c" +#line 24481 "Photo.c" GeeLinkedList* _tmp53_ = NULL; gint _tmp54_ = 0; gint _tmp55_ = 0; GeeLinkedList* _tmp56_ = NULL; gpointer _tmp57_ = NULL; PhotoCachedPixbuf* _tmp58_ = NULL; -#line 3305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = photo_source_pixbuf_cache; -#line 3305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 3305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _tmp54_; -#line 3305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp55_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) { -#line 3305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 24483 "Photo.c" +#line 24498 "Photo.c" } -#line 3306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = photo_source_pixbuf_cache; -#line 3306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_DEQUE, GeeDeque)); -#line 3306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = (PhotoCachedPixbuf*) _tmp57_; -#line 3306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (_tmp58_); -#line 24493 "Photo.c" +#line 24508 "Photo.c" } } -#line 3310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3312 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = photo_discard_source_id; -#line 3310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3312 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp59_ != ((guint) 0)) { -#line 24500 "Photo.c" +#line 24515 "Photo.c" guint _tmp60_ = 0U; -#line 3311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = photo_discard_source_id; -#line 3311 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3313 "/home/jens/Source/shotwell/src/Photo.vala" g_source_remove (_tmp60_); -#line 3312 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3314 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_source_id = (guint) 0; -#line 24508 "Photo.c" +#line 24523 "Photo.c" } -#line 3316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3318 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = photo_source_pixbuf_cache; -#line 3316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3318 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 3316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3318 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = _tmp62_; -#line 3316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3318 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp63_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) { -#line 24518 "Photo.c" +#line 24533 "Photo.c" gdouble _tmp64_ = 0.0; guint retry_sec = 0U; gdouble _tmp65_ = 0.0; gdouble _tmp66_ = 0.0; guint _tmp67_ = 0U; guint _tmp68_ = 0U; -#line 3317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = min_elapsed; -#line 3317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3319 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp64_ >= 0.0, "min_elapsed >= 0.0"); -#line 3320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = min_elapsed; -#line 3320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = trunc (_tmp65_); -#line 3320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" retry_sec = PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC - ((guint) _tmp66_); -#line 3321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = retry_sec; -#line 3321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3323 "/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 3321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3323 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_source_id = _tmp68_; -#line 24541 "Photo.c" +#line 24556 "Photo.c" } -#line 3324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = found; -#line 3324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp70_ != NULL) { -#line 24547 "Photo.c" +#line 24562 "Photo.c" PhotoCachedPixbuf* _tmp71_ = NULL; GdkPixbuf* _tmp72_ = NULL; -#line 3324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = found; -#line 3324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = _tmp71_->pixbuf; -#line 3324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = _tmp72_; -#line 24556 "Photo.c" +#line 24571 "Photo.c" } else { -#line 3324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = NULL; -#line 24560 "Photo.c" +#line 24575 "Photo.c" } -#line 3324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = _g_object_ref0 (_tmp69_); -#line 3324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp73_; -#line 3324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (iter); -#line 3324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 24570 "Photo.c" +#line 24585 "Photo.c" { GeeLinkedList* _tmp74_ = NULL; -#line 3253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = photo_source_pixbuf_cache; -#line 3253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache); -#line 24577 "Photo.c" +#line 24592 "Photo.c" } -#line 3324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3326 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24581 "Photo.c" +#line 24596 "Photo.c" } - __finally380: + __finally381: { GeeLinkedList* _tmp75_ = NULL; -#line 3253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = photo_source_pixbuf_cache; -#line 3253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache); -#line 24590 "Photo.c" +#line 24605 "Photo.c" } -#line 3253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3255 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24596 "Photo.c" +#line 24611 "Photo.c" } } @@ -24605,46 +24620,46 @@ static gboolean photo_trim_source_pixbuf_cache (void) { { GdkPixbuf* _tmp0_ = NULL; GdkPixbuf* _tmp1_ = NULL; -#line 3330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3332 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_run_source_pixbuf_cache (NULL, FALSE, &_inner_error_); -#line 3330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3332 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 3330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3332 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 3330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3332 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 24615 "Photo.c" - goto __catch381_g_error; +#line 24630 "Photo.c" + goto __catch382_g_error; } } - goto __finally381; - __catch381_g_error: + goto __finally382; + __catch382_g_error: { GError* err = NULL; -#line 3329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 3329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 3329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 24629 "Photo.c" +#line 24644 "Photo.c" } - __finally381: -#line 3329 "/home/jens/Source/shotwell/src/Photo.vala" + __finally382: +#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3331 "/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 3329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 3329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3331 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 24640 "Photo.c" +#line 24655 "Photo.c" } -#line 3334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3336 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 3334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3336 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24646 "Photo.c" +#line 24661 "Photo.c" } @@ -24662,39 +24677,39 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) { GdkPixbuf* _tmp4_ = NULL; GdkPixbuf* _tmp5_ = NULL; GError * _inner_error_ = NULL; -#line 3342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3344 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_run_source_pixbuf_cache (self, TRUE, &_inner_error_); -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp1_; -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24676 "Photo.c" +#line 24691 "Photo.c" } -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp0_; -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gdk_pixbuf_copy (_tmp3_); -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 3343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3345 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24696 "Photo.c" +#line 24711 "Photo.c" } @@ -24703,46 +24718,46 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) { */ void photo_discard_prefetched (Photo* self) { GError * _inner_error_ = NULL; -#line 3349 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3351 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 24707 "Photo.c" +#line 24722 "Photo.c" { GdkPixbuf* _tmp0_ = NULL; GdkPixbuf* _tmp1_ = NULL; -#line 3351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3353 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_run_source_pixbuf_cache (self, FALSE, &_inner_error_); -#line 3351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3353 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 3351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3353 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 3351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3353 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 24719 "Photo.c" - goto __catch382_g_error; +#line 24734 "Photo.c" + goto __catch383_g_error; } } - goto __finally382; - __catch382_g_error: + goto __finally383; + __catch383_g_error: { GError* err = NULL; -#line 3350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3352 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 3350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3352 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 3350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3352 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 24733 "Photo.c" +#line 24748 "Photo.c" } - __finally382: -#line 3350 "/home/jens/Source/shotwell/src/Photo.vala" + __finally383: +#line 3352 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3352 "/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 3350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3352 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 3350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3352 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 24744 "Photo.c" +#line 24759 "Photo.c" } } @@ -24794,117 +24809,117 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx gboolean _tmp101_ = FALSE; gboolean _tmp102_ = FALSE; GError * _inner_error_ = NULL; -#line 3367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 3380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_develop_raw_photos_to_files (); -#line 3380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 3380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_) { -#line 24806 "Photo.c" +#line 24821 "Photo.c" PhotoFileFormat _tmp5_ = 0; -#line 3381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_get_master_file_format (self); -#line 3381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp5_ == PHOTO_FILE_FORMAT_RAW; -#line 24812 "Photo.c" +#line 24827 "Photo.c" } else { -#line 3380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = FALSE; -#line 24816 "Photo.c" +#line 24831 "Photo.c" } -#line 3380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 24820 "Photo.c" +#line 24835 "Photo.c" gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; BackingFetchMode _tmp8_ = 0; -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = fetch_mode; -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ == BACKING_FETCH_MODE_BASELINE) { -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = TRUE; -#line 24830 "Photo.c" +#line 24845 "Photo.c" } else { BackingFetchMode _tmp9_ = 0; -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = fetch_mode; -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp9_ == BACKING_FETCH_MODE_UNMODIFIED; -#line 24837 "Photo.c" +#line 24852 "Photo.c" } -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = TRUE; -#line 24843 "Photo.c" +#line 24858 "Photo.c" } else { BackingFetchMode _tmp10_ = 0; -#line 3383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3385 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = fetch_mode; -#line 3383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3385 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp10_ == BACKING_FETCH_MODE_SOURCE; -#line 24850 "Photo.c" +#line 24865 "Photo.c" } -#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp6_; -#line 24854 "Photo.c" +#line 24869 "Photo.c" } else { -#line 3380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 24858 "Photo.c" +#line 24873 "Photo.c" } -#line 3380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 24862 "Photo.c" +#line 24877 "Photo.c" RawDeveloper _tmp11_ = 0; gboolean _tmp12_ = FALSE; -#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3386 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_get_raw_developer (self); -#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3386 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_is_raw_developer_complete (self, _tmp11_); -#line 3384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3386 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = !_tmp12_; -#line 24871 "Photo.c" +#line 24886 "Photo.c" } else { -#line 3380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 24875 "Photo.c" +#line 24890 "Photo.c" } -#line 3380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3382 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 24879 "Photo.c" +#line 24894 "Photo.c" RawDeveloper _tmp13_ = 0; -#line 3385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3387 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_get_raw_developer (self); -#line 3385 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3387 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_raw_developer (self, _tmp13_); -#line 24885 "Photo.c" +#line 24900 "Photo.c" } -#line 3390 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3392 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&original, 0, 0); -#line 3391 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3393 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&scaled, 0, 0); -#line 3392 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3394 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = NULL; -#line 3392 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3394 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances_length1 = 0; -#line 3392 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3394 "/home/jens/Source/shotwell/src/Photo.vala" _redeye_instances_size_ = redeye_instances_length1; -#line 3395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3397 "/home/jens/Source/shotwell/src/Photo.vala" transformer = NULL; -#line 24899 "Photo.c" +#line 24914 "Photo.c" { PhotoRow* _tmp14_ = NULL; -#line 3398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; -#line 3398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 24906 "Photo.c" +#line 24921 "Photo.c" { Dimensions _tmp15_ = {0}; PhotoException _tmp16_ = 0; @@ -24922,201 +24937,201 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx gboolean _tmp28_ = FALSE; gboolean _tmp29_ = FALSE; Orientation _tmp31_ = 0; -#line 3399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3401 "/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 3399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" original = _tmp15_; -#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = exceptions; -#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3402 "/home/jens/Source/shotwell/src/Photo.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp16_, &_tmp17_); -#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3402 "/home/jens/Source/shotwell/src/Photo.vala" scaling_get_scaled_dimensions (scaling, &_tmp17_, &_tmp18_); -#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3402 "/home/jens/Source/shotwell/src/Photo.vala" scaled = _tmp18_; -#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = scaled; -#line 3401 "/home/jens/Source/shotwell/src/Photo.vala" - scaled_to_viewport = _tmp19_; #line 3403 "/home/jens/Source/shotwell/src/Photo.vala" + scaled_to_viewport = _tmp19_; +#line 3405 "/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 3403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = scaled; -#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = dimensions_equals (&_tmp20_, &_tmp21_); -#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - is_scaled = !_tmp22_; #line 3405 "/home/jens/Source/shotwell/src/Photo.vala" + is_scaled = !_tmp22_; +#line 3407 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = photo_get_raw_redeye_instances (self, &_tmp23_); -#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3407 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = (g_free (redeye_instances), NULL); -#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3407 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = _tmp24_; -#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3407 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances_length1 = _tmp23_; -#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" - _redeye_instances_size_ = redeye_instances_length1; #line 3407 "/home/jens/Source/shotwell/src/Photo.vala" + _redeye_instances_size_ = redeye_instances_length1; +#line 3409 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = photo_get_raw_crop (self, &_tmp25_); -#line 3407 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3409 "/home/jens/Source/shotwell/src/Photo.vala" crop = _tmp25_; -#line 3407 "/home/jens/Source/shotwell/src/Photo.vala" - is_cropped = _tmp26_; #line 3409 "/home/jens/Source/shotwell/src/Photo.vala" + is_cropped = _tmp26_; +#line 3411 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = photo_get_raw_straighten (self, &_tmp27_); -#line 3409 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3411 "/home/jens/Source/shotwell/src/Photo.vala" straightening_angle = _tmp27_; -#line 3409 "/home/jens/Source/shotwell/src/Photo.vala" - is_straightened = _tmp28_; #line 3411 "/home/jens/Source/shotwell/src/Photo.vala" + is_straightened = _tmp28_; +#line 3413 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = photo_has_color_adjustments (self); -#line 3411 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3413 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_) { -#line 24974 "Photo.c" +#line 24989 "Photo.c" PixelTransformer* _tmp30_ = NULL; -#line 3412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3414 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = photo_get_pixel_transformer (self); -#line 3412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3414 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (transformer); -#line 3412 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3414 "/home/jens/Source/shotwell/src/Photo.vala" transformer = _tmp30_; -#line 24982 "Photo.c" +#line 24997 "Photo.c" } -#line 3414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3416 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = photo_get_orientation (self); -#line 3414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3416 "/home/jens/Source/shotwell/src/Photo.vala" orientation = _tmp31_; -#line 24988 "Photo.c" +#line 25003 "Photo.c" } - __finally383: + __finally384: { PhotoRow* _tmp32_ = NULL; -#line 3398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = self->row; -#line 3398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 24997 "Photo.c" +#line 25012 "Photo.c" } -#line 3398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (transformer); -#line 3398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = (g_free (redeye_instances), NULL); -#line 3398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3400 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 25009 "Photo.c" +#line 25024 "Photo.c" } } -#line 3421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = photo_get_prefetched_copy (self, &_inner_error_); -#line 3421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp33_; -#line 3421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (transformer); -#line 3421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = (g_free (redeye_instances), NULL); -#line 3421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3423 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 25026 "Photo.c" +#line 25041 "Photo.c" } -#line 3428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3430 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = exceptions; -#line 3428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3430 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_exception_allows (_tmp34_, PHOTO_EXCEPTION_REDEYE); -#line 3428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3430 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp35_) { -#line 25034 "Photo.c" +#line 25049 "Photo.c" EditingToolsRedeyeInstance* _tmp36_ = NULL; gint _tmp36__length1 = 0; -#line 3433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = redeye_instances; -#line 3433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36__length1 = redeye_instances_length1; -#line 25041 "Photo.c" +#line 25056 "Photo.c" { EditingToolsRedeyeInstance* instance_collection = NULL; gint instance_collection_length1 = 0; gint _instance_collection_size_ = 0; gint instance_it = 0; -#line 3433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" instance_collection = _tmp36_; -#line 3433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" instance_collection_length1 = _tmp36__length1; -#line 3433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" for (instance_it = 0; instance_it < _tmp36__length1; instance_it = instance_it + 1) { -#line 25053 "Photo.c" +#line 25068 "Photo.c" EditingToolsRedeyeInstance instance = {0}; -#line 3433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" instance = instance_collection[instance_it]; -#line 25057 "Photo.c" +#line 25072 "Photo.c" { GdkPixbuf* _tmp37_ = NULL; EditingToolsRedeyeInstance _tmp38_ = {0}; GdkPixbuf* _tmp39_ = NULL; -#line 3434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = pixbuf; -#line 3434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = instance; -#line 3434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = photo_do_redeye (self, _tmp37_, &_tmp38_); -#line 3434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3436 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3436 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp39_; -#line 25072 "Photo.c" +#line 25087 "Photo.c" } } } } -#line 3442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = exceptions; -#line 3442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_STRAIGHTEN); -#line 3442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3444 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp41_) { -#line 25083 "Photo.c" +#line 25098 "Photo.c" gboolean _tmp42_ = FALSE; -#line 3446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3448 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = is_straightened; -#line 3446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3448 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp42_) { -#line 25089 "Photo.c" +#line 25104 "Photo.c" GdkPixbuf* _tmp43_ = NULL; gdouble _tmp44_ = 0.0; GdkPixbuf* _tmp45_ = NULL; -#line 3447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = pixbuf; -#line 3447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = straightening_angle; -#line 3447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = rotate_arb (_tmp43_, _tmp44_); -#line 3447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3447 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp45_; -#line 25103 "Photo.c" +#line 25118 "Photo.c" } } -#line 3456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3458 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = exceptions; -#line 3456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3458 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = photo_exception_allows (_tmp46_, PHOTO_EXCEPTION_CROP); -#line 3456 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3458 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp47_) { -#line 25112 "Photo.c" +#line 25127 "Photo.c" gboolean _tmp48_ = FALSE; -#line 3460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3462 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = is_cropped; -#line 3460 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3462 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp48_) { -#line 25118 "Photo.c" +#line 25133 "Photo.c" Box _tmp49_ = {0}; gint _tmp50_ = 0; GdkPixbuf* _tmp51_ = NULL; @@ -25153,255 +25168,255 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx gint _tmp82_ = 0; gint _tmp83_ = 0; GdkPixbuf* _tmp84_ = NULL; -#line 3465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = crop; -#line 3465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = _tmp49_.left; -#line 3465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = pixbuf; -#line 3465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = gdk_pixbuf_get_width (_tmp51_); -#line 3465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp52_; -#line 3465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = CLAMP (_tmp50_, 0, _tmp53_ - 2); -#line 3465 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3467 "/home/jens/Source/shotwell/src/Photo.vala" crop.left = _tmp54_; -#line 3466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = crop; -#line 3466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = _tmp55_.top; -#line 3466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = pixbuf; -#line 3466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = gdk_pixbuf_get_height (_tmp57_); -#line 3466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = _tmp58_; -#line 3466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = CLAMP (_tmp56_, 0, _tmp59_ - 2); -#line 3466 "/home/jens/Source/shotwell/src/Photo.vala" - crop.top = _tmp60_; #line 3468 "/home/jens/Source/shotwell/src/Photo.vala" + crop.top = _tmp60_; +#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = crop; -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = _tmp61_.right; -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = crop; -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = _tmp63_.left; -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = pixbuf; -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = gdk_pixbuf_get_width (_tmp65_); -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = _tmp66_; -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = CLAMP (_tmp62_, _tmp64_ + 1, _tmp67_ - 1); -#line 3468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3470 "/home/jens/Source/shotwell/src/Photo.vala" crop.right = _tmp68_; -#line 3469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = crop; -#line 3469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = _tmp69_.bottom; -#line 3469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = crop; -#line 3469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = _tmp71_.top; -#line 3469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = pixbuf; -#line 3469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = gdk_pixbuf_get_height (_tmp73_); -#line 3469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = _tmp74_; -#line 3469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = CLAMP (_tmp70_, _tmp72_ + 1, _tmp75_ - 1); -#line 3469 "/home/jens/Source/shotwell/src/Photo.vala" - crop.bottom = _tmp76_; #line 3471 "/home/jens/Source/shotwell/src/Photo.vala" + crop.bottom = _tmp76_; +#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = pixbuf; -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = crop; -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = _tmp78_.left; -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = crop; -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = _tmp80_.top; -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = box_get_width (&crop); -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = box_get_height (&crop); -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = gdk_pixbuf_new_subpixbuf (_tmp77_, _tmp79_, _tmp81_, _tmp82_, _tmp83_); -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3471 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3473 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp84_; -#line 25239 "Photo.c" +#line 25254 "Photo.c" } } -#line 3481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = exceptions; -#line 3481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = photo_exception_allows (_tmp85_, PHOTO_EXCEPTION_ORIENTATION); -#line 3481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3483 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp86_) { -#line 25248 "Photo.c" +#line 25263 "Photo.c" GdkPixbuf* _tmp87_ = NULL; GdkPixbuf* _tmp88_ = NULL; -#line 3485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = pixbuf; -#line 3485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = orientation_rotate_pixbuf (orientation, _tmp87_); -#line 3485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3485 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp88_; -#line 25259 "Photo.c" +#line 25274 "Photo.c" } -#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3494 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = is_scaled; -#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3494 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp89_) { -#line 25265 "Photo.c" +#line 25280 "Photo.c" GdkPixbuf* _tmp90_ = NULL; Dimensions _tmp91_ = {0}; gint _tmp92_ = 0; Dimensions _tmp93_ = {0}; gint _tmp94_ = 0; GdkPixbuf* _tmp95_ = NULL; -#line 3496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = pixbuf; -#line 3496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = scaled_to_viewport; -#line 3496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = _tmp91_.width; -#line 3496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = scaled_to_viewport; -#line 3496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = _tmp93_.height; -#line 3496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = gdk_pixbuf_scale_simple (_tmp90_, _tmp92_, _tmp94_, GDK_INTERP_BILINEAR); -#line 3496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3496 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3498 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp95_; -#line 25288 "Photo.c" +#line 25303 "Photo.c" } -#line 3504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3506 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = exceptions; -#line 3504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3506 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = photo_exception_allows (_tmp96_, PHOTO_EXCEPTION_ADJUST); -#line 3504 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3506 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp97_) { -#line 25296 "Photo.c" +#line 25311 "Photo.c" PixelTransformer* _tmp98_ = NULL; -#line 3508 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3510 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = transformer; -#line 3508 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3510 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp98_ != NULL) { -#line 25302 "Photo.c" +#line 25317 "Photo.c" PixelTransformer* _tmp99_ = NULL; GdkPixbuf* _tmp100_ = NULL; -#line 3509 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3511 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = transformer; -#line 3509 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3511 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = pixbuf; -#line 3509 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3511 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformer_transform_pixbuf (_tmp99_, _tmp100_, NULL); -#line 25311 "Photo.c" +#line 25326 "Photo.c" } } -#line 3518 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = is_scaled; -#line 3518 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3520 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp102_) { -#line 25318 "Photo.c" +#line 25333 "Photo.c" gboolean _tmp103_ = FALSE; -#line 3518 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = is_straightened; -#line 3518 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = !_tmp103_; -#line 25324 "Photo.c" +#line 25339 "Photo.c" } else { -#line 3518 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3520 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = FALSE; -#line 25328 "Photo.c" +#line 25343 "Photo.c" } -#line 3518 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3520 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp101_) { -#line 25332 "Photo.c" +#line 25347 "Photo.c" GdkPixbuf* _tmp104_ = NULL; Dimensions _tmp105_ = {0}; gboolean _tmp106_ = FALSE; -#line 3519 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3521 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = pixbuf; -#line 3519 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3521 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_for_pixbuf (_tmp104_, &_tmp105_); -#line 3519 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3521 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = dimensions_approx_equals (&scaled_to_viewport, &_tmp105_, PHOTO_SCALING_FUDGE); -#line 3519 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3521 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp106_, "scaled_to_viewport.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)"); -#line 25344 "Photo.c" +#line 25359 "Photo.c" } -#line 3527 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3529 "/home/jens/Source/shotwell/src/Photo.vala" result = pixbuf; -#line 3527 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3529 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (transformer); -#line 3527 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3529 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = (g_free (redeye_instances), NULL); -#line 3527 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3529 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25354 "Photo.c" +#line 25369 "Photo.c" } static gboolean photo_real_has_user_generated_metadata (Photo* self) { -#line 3535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3537 "/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 3535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3537 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 25363 "Photo.c" +#line 25378 "Photo.c" } gboolean photo_has_user_generated_metadata (Photo* self) { -#line 3535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3537 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 3535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3537 "/home/jens/Source/shotwell/src/Photo.vala" return PHOTO_GET_CLASS (self)->has_user_generated_metadata (self); -#line 25372 "Photo.c" +#line 25387 "Photo.c" } static void photo_real_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) { -#line 3539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3541 "/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 3539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3541 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 25381 "Photo.c" +#line 25396 "Photo.c" } void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) { -#line 3539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3541 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3541 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->set_user_metadata_for_export (self, metadata); -#line 25390 "Photo.c" +#line 25405 "Photo.c" } gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { gchar* result = NULL; PhotoFileFormat* _tmp0_ = NULL; -#line 3546 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 3547 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3549 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file_format; -#line 3547 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3549 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 25403 "Photo.c" +#line 25418 "Photo.c" PhotoFileFormat* _tmp1_ = NULL; PhotoFileFormatProperties* _tmp2_ = NULL; PhotoFileFormatProperties* _tmp3_ = NULL; @@ -25411,45 +25426,45 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { GFile* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file_format; -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_file_format_get_properties (*_tmp1_); -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_file_format_properties_convert_file_extension (_tmp3_, _tmp5_); -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_file_get_basename (_tmp7_); -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp7_); -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp5_); -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (_tmp3_); -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp9_; -#line 3548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25441 "Photo.c" +#line 25456 "Photo.c" } else { PhotoFileFormat _tmp10_ = 0; gboolean _tmp11_ = FALSE; -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_get_file_format (self); -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo_file_format_can_write (_tmp10_); -#line 3550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3552 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 25451 "Photo.c" +#line 25466 "Photo.c" PhotoFileFormat _tmp12_ = 0; PhotoFileFormatProperties* _tmp13_ = NULL; PhotoFileFormatProperties* _tmp14_ = NULL; @@ -25459,35 +25474,35 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { GFile* _tmp18_ = NULL; gchar* _tmp19_ = NULL; gchar* _tmp20_ = NULL; -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_get_file_format (self); -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_file_format_get_properties (_tmp12_); -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_; -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_file_format_properties_convert_file_extension (_tmp14_, _tmp16_); -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_; -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = g_file_get_basename (_tmp18_); -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp18_); -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp16_); -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (_tmp14_); -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp20_; -#line 3551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3553 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25489 "Photo.c" +#line 25504 "Photo.c" } else { PhotoFileFormat _tmp21_ = 0; PhotoFileFormatProperties* _tmp22_ = NULL; @@ -25498,35 +25513,35 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { GFile* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_file_format_get_system_default_format (); -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = photo_file_format_get_properties (_tmp21_); -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_; -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_; -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = photo_file_format_properties_convert_file_extension (_tmp23_, _tmp25_); -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_; -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = g_file_get_basename (_tmp27_); -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp28_; -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp27_); -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp25_); -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (_tmp23_); -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp29_; -#line 3554 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3556 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25528 "Photo.c" +#line 25543 "Photo.c" } } } @@ -25580,465 +25595,465 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole PhotoFileMetadataWriter* _tmp97_ = NULL; PhotoMetadata* _tmp98_ = NULL; GError * _inner_error_ = NULL; -#line 3560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3562 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 3560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3562 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 3563 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3565 "/home/jens/Source/shotwell/src/Photo.vala" export_reader = NULL; -#line 3564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3566 "/home/jens/Source/shotwell/src/Photo.vala" is_master = TRUE; -#line 25590 "Photo.c" +#line 25605 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 3565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 3565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 25597 "Photo.c" +#line 25612 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoBackingReaders* _tmp2_ = NULL; PhotoFileReader* _tmp3_ = NULL; -#line 3566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->readers; -#line 3566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->editable; -#line 3566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 25608 "Photo.c" +#line 25623 "Photo.c" PhotoBackingReaders* _tmp4_ = NULL; PhotoFileReader* _tmp5_ = NULL; PhotoFileFormat _tmp6_ = 0; gboolean _tmp7_ = FALSE; -#line 3566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 3566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->editable; -#line 3566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3568 "/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 3566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_file_format_can_write_metadata (_tmp6_); -#line 3566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp7_; -#line 25623 "Photo.c" +#line 25638 "Photo.c" } else { -#line 3566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 25627 "Photo.c" +#line 25642 "Photo.c" } -#line 3566 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 25631 "Photo.c" +#line 25646 "Photo.c" PhotoBackingReaders* _tmp8_ = NULL; PhotoFileReader* _tmp9_ = NULL; PhotoFileReader* _tmp10_ = NULL; -#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->priv->readers; -#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_->editable; -#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _photo_file_adapter_ref0 (_tmp9_); -#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" export_reader = _tmp10_; -#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3570 "/home/jens/Source/shotwell/src/Photo.vala" is_master = FALSE; -#line 25647 "Photo.c" +#line 25662 "Photo.c" } else { gboolean _tmp11_ = FALSE; PhotoBackingReaders* _tmp12_ = NULL; PhotoFileReader* _tmp13_ = NULL; -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->readers; -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_->developer; -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ != NULL) { -#line 25658 "Photo.c" +#line 25673 "Photo.c" PhotoBackingReaders* _tmp14_ = NULL; PhotoFileReader* _tmp15_ = NULL; PhotoFileFormat _tmp16_ = 0; gboolean _tmp17_ = FALSE; -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->priv->readers; -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->developer; -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3571 "/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 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_file_format_can_write_metadata (_tmp16_); -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp17_; -#line 25673 "Photo.c" +#line 25688 "Photo.c" } else { -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; -#line 25677 "Photo.c" +#line 25692 "Photo.c" } -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 25681 "Photo.c" +#line 25696 "Photo.c" PhotoBackingReaders* _tmp18_ = NULL; PhotoFileReader* _tmp19_ = NULL; PhotoFileReader* _tmp20_ = NULL; -#line 3570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->priv->readers; -#line 3570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->developer; -#line 3570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _photo_file_adapter_ref0 (_tmp19_); -#line 3570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" export_reader = _tmp20_; -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3573 "/home/jens/Source/shotwell/src/Photo.vala" is_master = FALSE; -#line 25697 "Photo.c" +#line 25712 "Photo.c" } else { PhotoBackingReaders* _tmp21_ = NULL; PhotoFileReader* _tmp22_ = NULL; PhotoFileFormat _tmp23_ = 0; gboolean _tmp24_ = FALSE; -#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = self->priv->readers; -#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_->master; -#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3574 "/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 3572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = photo_file_format_can_write_metadata (_tmp23_); -#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3574 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_) { -#line 25713 "Photo.c" +#line 25728 "Photo.c" PhotoBackingReaders* _tmp25_ = NULL; PhotoFileReader* _tmp26_ = NULL; PhotoFileReader* _tmp27_ = NULL; -#line 3573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->priv->readers; -#line 3573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_->master; -#line 3573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _photo_file_adapter_ref0 (_tmp26_); -#line 3573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" export_reader = _tmp27_; -#line 25727 "Photo.c" +#line 25742 "Photo.c" } } } } - __finally384: + __finally385: { PhotoBackingReaders* _tmp28_ = NULL; -#line 3565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = self->priv->readers; -#line 3565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 25739 "Photo.c" +#line 25754 "Photo.c" } -#line 3565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3567 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 25749 "Photo.c" +#line 25764 "Photo.c" } } -#line 3577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3579 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = export_reader; -#line 3577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3579 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_ == NULL) { -#line 3578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3580 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 3578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3580 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3580 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25762 "Photo.c" +#line 25777 "Photo.c" } -#line 3580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3582 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = export_reader; -#line 3580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3582 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3582 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = photo_file_format_get_properties (_tmp31_); -#line 3580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3582 "/home/jens/Source/shotwell/src/Photo.vala" format_properties = _tmp32_; -#line 3583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = format_properties; -#line 3583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = file; -#line 3583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_file_format_properties_convert_file_extension (_tmp33_, _tmp34_); -#line 3583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3585 "/home/jens/Source/shotwell/src/Photo.vala" dest_file = _tmp35_; -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = export_reader; -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = dest_file; -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = g_file_get_path (_tmp38_); -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = _tmp39_; -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = photo_file_format_create_metadata_writer (_tmp37_, _tmp40_, &_inner_error_); -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_; -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp40_); -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" writer = _tmp42_; -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dest_file); -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (format_properties); -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3588 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 25810 "Photo.c" +#line 25825 "Photo.c" } -#line 3589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 3589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp43_; -#line 3589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = writer; -#line 3589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _tmp46_; -#line 3589 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3589: Exporting full-sized copy of %s to %s", _tmp44_, _tmp47_); -#line 3589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:3591: Exporting full-sized copy of %s to %s", _tmp44_, _tmp47_); +#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp47_); -#line 3589 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp44_); #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp44_); +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = export_reader; -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = _tmp49_; -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = dest_file; -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" g_file_copy (_tmp50_, _tmp51_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp50_); -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dest_file); -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (format_properties); -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 25854 "Photo.c" +#line 25869 "Photo.c" } -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = photo_has_alterations (self); -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp57_) { -#line 25860 "Photo.c" +#line 25875 "Photo.c" gboolean _tmp58_ = FALSE; -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = is_master; -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = _tmp58_; -#line 25866 "Photo.c" +#line 25881 "Photo.c" } else { -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = FALSE; -#line 25870 "Photo.c" +#line 25885 "Photo.c" } -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp56_) { -#line 25874 "Photo.c" +#line 25889 "Photo.c" gboolean _tmp59_ = FALSE; -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = photo_has_user_generated_metadata (self); -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = !_tmp59_; -#line 25880 "Photo.c" +#line 25895 "Photo.c" } else { -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = FALSE; -#line 25884 "Photo.c" +#line 25899 "Photo.c" } -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp55_) { -#line 25888 "Photo.c" +#line 25903 "Photo.c" gchar* _tmp60_ = NULL; gchar* _tmp61_ = NULL; -#line 3597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _tmp60_; -#line 3597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = _tmp61_ == NULL; -#line 3597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp61_); -#line 25899 "Photo.c" +#line 25914 "Photo.c" } else { -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = FALSE; -#line 25903 "Photo.c" +#line 25918 "Photo.c" } -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp54_) { -#line 25907 "Photo.c" +#line 25922 "Photo.c" gchar* _tmp62_ = NULL; gchar* _tmp63_ = NULL; -#line 3597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = _tmp62_; -#line 3597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp63_ == NULL; -#line 3597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp63_); -#line 25918 "Photo.c" +#line 25933 "Photo.c" } else { -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = FALSE; -#line 25922 "Photo.c" +#line 25937 "Photo.c" } -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp53_) { -#line 25926 "Photo.c" +#line 25941 "Photo.c" gboolean _tmp64_ = FALSE; -#line 3597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = export_metadata; -#line 3597 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3599 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = _tmp64_; -#line 25932 "Photo.c" +#line 25947 "Photo.c" } else { -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = FALSE; -#line 25936 "Photo.c" +#line 25951 "Photo.c" } -#line 3596 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp52_) { #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" + if (_tmp52_) { +#line 3600 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3600 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3600 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dest_file); -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3600 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (format_properties); -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3600 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3600 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25952 "Photo.c" +#line 25967 "Photo.c" } -#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = export_reader; -#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = photo_file_reader_read_metadata (_tmp65_, &_inner_error_); -#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp66_; -#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dest_file); -#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (format_properties); -#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 25974 "Photo.c" +#line 25989 "Photo.c" } -#line 3602 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3604 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = metadata; -#line 3602 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3604 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp67_ == NULL) { -#line 25980 "Photo.c" +#line 25995 "Photo.c" PhotoFileReader* _tmp68_ = NULL; PhotoFileFormat _tmp69_ = 0; PhotoMetadata* _tmp70_ = NULL; -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = export_reader; -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = photo_file_format_create_metadata (_tmp69_); -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp70_; -#line 25994 "Photo.c" +#line 26009 "Photo.c" } -#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = writer; -#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = _tmp72_; -#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3605: Updating metadata of %s", _tmp73_); -#line 3605 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp73_); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + g_debug ("Photo.vala:3607: Updating metadata of %s", _tmp73_); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp73_); +#line 3609 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp74_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); +#line 3609 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp74_ != ((time_t) 0)) { -#line 26010 "Photo.c" +#line 26025 "Photo.c" PhotoMetadata* _tmp75_ = NULL; time_t _tmp76_ = 0; MetadataDateTime* _tmp77_ = NULL; MetadataDateTime* _tmp78_ = NULL; -#line 3608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = metadata; -#line 3608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = metadata_date_time_new (_tmp76_); -#line 3608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = _tmp77_; -#line 3608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_exposure_date_time (_tmp75_, _tmp78_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (_tmp78_); -#line 26027 "Photo.c" +#line 26042 "Photo.c" } else { PhotoMetadata* _tmp79_ = NULL; -#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = metadata; -#line 3610 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_exposure_date_time (_tmp79_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 26034 "Photo.c" +#line 26049 "Photo.c" } -#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3614 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = export_metadata; -#line 3612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3614 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp80_) { -#line 26040 "Photo.c" +#line 26055 "Photo.c" PhotoMetadata* _tmp81_ = NULL; gchar* _tmp82_ = NULL; gchar* _tmp83_ = NULL; @@ -26053,108 +26068,108 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole Orientation _tmp92_ = 0; Orientation _tmp93_ = 0; PhotoMetadata* _tmp95_ = NULL; -#line 3614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = metadata; -#line 3614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3616 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = _tmp82_; -#line 3614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3616 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_title (_tmp81_, _tmp83_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3616 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp83_); -#line 3615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = metadata; -#line 3615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = _tmp85_; -#line 3615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_comment (_tmp84_, _tmp86_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3615 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp86_); -#line 3616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = metadata; -#line 3616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp88_); -#line 3616 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_pixel_dimensions (_tmp87_, &_tmp88_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3619 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = metadata; -#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3619 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = photo_get_orientation (self); -#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3619 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_orientation (_tmp89_, _tmp90_); -#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = metadata; -#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_software (_tmp91_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); #line 3620 "/home/jens/Source/shotwell/src/Photo.vala" + photo_metadata_set_software (_tmp91_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); +#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = photo_get_orientation (self); -#line 3620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = photo_get_original_orientation (self); -#line 3620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3622 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp92_ != _tmp93_) { -#line 26097 "Photo.c" +#line 26112 "Photo.c" PhotoMetadata* _tmp94_ = NULL; -#line 3621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3623 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = metadata; -#line 3621 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3623 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_remove_exif_thumbnail (_tmp94_); -#line 26103 "Photo.c" +#line 26118 "Photo.c" } -#line 3623 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3625 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = metadata; -#line 3623 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3625 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_user_metadata_for_export (self, _tmp95_); -#line 26109 "Photo.c" +#line 26124 "Photo.c" } else { PhotoMetadata* _tmp96_ = NULL; -#line 3627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = metadata; -#line 3627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_clear (_tmp96_); -#line 26116 "Photo.c" +#line 26131 "Photo.c" } -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = writer; -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = metadata; -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp97_, _tmp98_, &_inner_error_); -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dest_file); -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (format_properties); -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 26140 "Photo.c" +#line 26155 "Photo.c" } -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dest_file); -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (format_properties); -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); -#line 3631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 26156 "Photo.c" +#line 26171 "Photo.c" } @@ -26164,59 +26179,59 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 3637 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3639 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 3637 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3639 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, FALSE); -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = scaling_is_unscaled (scaling); -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp3_) { -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = TRUE; -#line 26176 "Photo.c" +#line 26191 "Photo.c" } else { gboolean _tmp4_ = FALSE; -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_has_alterations (self); -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp4_; -#line 26183 "Photo.c" +#line 26198 "Photo.c" } -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = TRUE; -#line 26189 "Photo.c" +#line 26204 "Photo.c" } else { gboolean _tmp5_ = FALSE; -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_has_user_generated_metadata (self); -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp5_; -#line 26196 "Photo.c" +#line 26211 "Photo.c" } -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 26202 "Photo.c" +#line 26217 "Photo.c" } else { PhotoFileFormat _tmp6_ = 0; PhotoFileFormat _tmp7_ = 0; -#line 3639 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3641 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = export_format; -#line 3639 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3641 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_get_file_format (self); -#line 3639 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3641 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp6_ != _tmp7_; -#line 26212 "Photo.c" +#line 26227 "Photo.c" } -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3640 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 26218 "Photo.c" +#line 26233 "Photo.c" } @@ -26268,342 +26283,342 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality PhotoFileMetadataWriter* _tmp94_ = NULL; PhotoMetadata* _tmp95_ = NULL; GError * _inner_error_ = NULL; -#line 3645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (dest_file)); -#line 3645 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_if_fail (scaling != NULL); #line 3647 "/home/jens/Source/shotwell/src/Photo.vala" + g_return_if_fail (scaling != NULL); +#line 3649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = direct_copy_unmodified; -#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3649 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 26280 "Photo.c" +#line 26295 "Photo.c" GFile* _tmp1_ = NULL; GFile* _tmp2_ = NULL; GFile* _tmp3_ = NULL; -#line 3648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 3648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = dest_file; -#line 3648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/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 3648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp2_); -#line 3648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26300 "Photo.c" +#line 26315 "Photo.c" } -#line 3650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3652 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26304 "Photo.c" +#line 26319 "Photo.c" } -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = scaling_is_unscaled (scaling); -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { -#line 26310 "Photo.c" +#line 26325 "Photo.c" gboolean _tmp8_ = FALSE; gboolean _tmp9_ = FALSE; -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_has_alterations (self); -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp9_) { -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = TRUE; -#line 26319 "Photo.c" +#line 26334 "Photo.c" } else { gboolean _tmp10_ = FALSE; -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_only_metadata_changed (self); -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp10_; -#line 26326 "Photo.c" +#line 26341 "Photo.c" } -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp8_; -#line 26330 "Photo.c" +#line 26345 "Photo.c" } else { -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; -#line 26334 "Photo.c" +#line 26349 "Photo.c" } -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 26338 "Photo.c" +#line 26353 "Photo.c" PhotoFileFormat _tmp11_ = 0; PhotoFileFormat _tmp12_ = 0; -#line 3658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = export_format; -#line 3658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_get_file_format (self); -#line 3658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp11_ == _tmp12_; -#line 26347 "Photo.c" +#line 26362 "Photo.c" } else { -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = FALSE; -#line 26351 "Photo.c" +#line 26366 "Photo.c" } -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 26355 "Photo.c" +#line 26370 "Photo.c" PhotoFileFormat _tmp13_ = 0; -#line 3658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_get_file_format (self); -#line 3658 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp13_ == PHOTO_FILE_FORMAT_JFIF; -#line 26361 "Photo.c" +#line 26376 "Photo.c" } else { -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = FALSE; -#line 26365 "Photo.c" +#line 26380 "Photo.c" } -#line 3657 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_) { -#line 26369 "Photo.c" +#line 26384 "Photo.c" gboolean _tmp14_ = FALSE; GFile* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; gboolean _tmp17_ = FALSE; -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = dest_file; -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = export_metadata; -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_export_fullsized_backing (self, _tmp15_, _tmp16_, &_inner_error_); -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp17_; -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26388 "Photo.c" +#line 26403 "Photo.c" } -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3661 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_) { -#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3662 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26394 "Photo.c" +#line 26409 "Photo.c" } } -#line 3666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource)); -#line 3666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3668 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp18_; -#line 3667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = metadata; -#line 3667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_ == NULL) { -#line 26405 "Photo.c" +#line 26420 "Photo.c" PhotoFileFormat _tmp20_ = 0; PhotoMetadata* _tmp21_ = NULL; -#line 3668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3670 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = export_format; -#line 3668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3670 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_file_format_create_metadata (_tmp20_); -#line 3668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3670 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3668 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3670 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp21_; -#line 26416 "Photo.c" +#line 26431 "Photo.c" } -#line 3670 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3672 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = export_format; -#line 3670 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3672 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo_file_format_can_write (_tmp22_); -#line 3670 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3672 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp23_) { -#line 26424 "Photo.c" +#line 26439 "Photo.c" PhotoFileFormat _tmp24_ = 0; -#line 3671 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = photo_file_format_get_system_default_format (); -#line 3671 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" export_format = _tmp24_; -#line 26430 "Photo.c" +#line 26445 "Photo.c" } -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = export_format; -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = dest_file; -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = g_file_get_path (_tmp26_); -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_; -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = photo_file_format_create_writer (_tmp25_, _tmp28_, &_inner_error_); -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_; -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp28_); -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" writer = _tmp30_; -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3673 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26456 "Photo.c" +#line 26471 "Photo.c" } -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_; -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = writer; -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3677 "/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 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_; -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = export_format; -#line 3676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), _tmp36_); -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3675: Saving transformed version of %s to %s in file format" \ +#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" + g_debug ("Photo.vala:3677: Saving transformed version of %s to %s in file format" \ " %s", _tmp32_, _tmp35_, (_tmp37_ != NULL) ? _tmp37_->value_name : NULL); -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp35_); -#line 3675 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3677 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp32_); -#line 3682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = photo_get_file_format (self); -#line 3682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp39_ == PHOTO_FILE_FORMAT_JFIF) { -#line 3682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = TRUE; -#line 26484 "Photo.c" +#line 26499 "Photo.c" } else { PhotoFileFormat _tmp40_ = 0; -#line 3683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = photo_get_file_format (self); -#line 3683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp40_ == PHOTO_FILE_FORMAT_RAW; -#line 26491 "Photo.c" +#line 26506 "Photo.c" } -#line 3682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp38_) { -#line 26495 "Photo.c" +#line 26510 "Photo.c" GdkPixbuf* _tmp41_ = NULL; Scaling _tmp42_ = {0}; GdkPixbuf* _tmp43_ = NULL; GdkPixbuf* _tmp44_ = NULL; -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = *scaling; -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3686 "/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 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp43_; -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26518 "Photo.c" +#line 26533 "Photo.c" } -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp41_; -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = NULL; -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3686 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp44_; -#line 3682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp41_); -#line 26530 "Photo.c" +#line 26545 "Photo.c" } else { GdkPixbuf* _tmp45_ = NULL; Scaling _tmp46_ = {0}; GdkPixbuf* _tmp47_ = NULL; GdkPixbuf* _tmp48_ = NULL; -#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = *scaling; -#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3690 "/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 3688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp47_; -#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26554 "Photo.c" +#line 26569 "Photo.c" } -#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp45_; -#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = NULL; -#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3688 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3690 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp48_; -#line 3682 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3684 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp45_); -#line 26566 "Photo.c" +#line 26581 "Photo.c" } -#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = writer; -#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = pixbuf; -#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = quality; -#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_writer_write (_tmp49_, _tmp50_, _tmp51_, &_inner_error_); -#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26588 "Photo.c" +#line 26603 "Photo.c" } -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = writer; -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3696 "/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 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = _tmp53_; -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3694: Setting EXIF for %s", _tmp54_); -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp54_); -#line 3697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = export_metadata; -#line 3697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3699 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp55_) { -#line 26604 "Photo.c" +#line 26619 "Photo.c" PhotoMetadata* _tmp56_ = NULL; gchar* _tmp57_ = NULL; gchar* _tmp58_ = NULL; @@ -26616,213 +26631,213 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality PhotoMetadata* _tmp70_ = NULL; PhotoMetadata* _tmp71_ = NULL; gboolean _tmp72_ = FALSE; -#line 3699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3701 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = metadata; -#line 3699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3701 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3701 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = _tmp57_; -#line 3699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3701 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_title (_tmp56_, _tmp58_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3701 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp58_); -#line 3700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3702 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = metadata; -#line 3700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3702 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3702 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _tmp60_; -#line 3700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3702 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_comment (_tmp59_, _tmp61_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3700 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3702 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp61_); -#line 3701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3703 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = metadata; -#line 3701 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_software (_tmp62_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); #line 3703 "/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" _tmp63_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3703 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3705 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp63_ != ((time_t) 0)) { -#line 26645 "Photo.c" +#line 26660 "Photo.c" PhotoMetadata* _tmp64_ = NULL; time_t _tmp65_ = 0; MetadataDateTime* _tmp66_ = NULL; MetadataDateTime* _tmp67_ = NULL; -#line 3704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = metadata; -#line 3704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = metadata_date_time_new (_tmp65_); -#line 3704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = _tmp66_; -#line 3704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_exposure_date_time (_tmp64_, _tmp67_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (_tmp67_); -#line 26662 "Photo.c" +#line 26677 "Photo.c" } else { PhotoMetadata* _tmp68_ = NULL; -#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3708 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = metadata; -#line 3706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3708 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_exposure_date_time (_tmp68_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 26669 "Photo.c" +#line 26684 "Photo.c" } -#line 3708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3710 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = metadata; -#line 3708 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3710 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_remove_tag (_tmp69_, "Exif.Iop.RelatedImageWidth"); -#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3711 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = metadata; -#line 3709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3711 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_remove_tag (_tmp70_, "Exif.Iop.RelatedImageHeight"); -#line 3710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = metadata; -#line 3710 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_remove_exif_thumbnail (_tmp71_); #line 3712 "/home/jens/Source/shotwell/src/Photo.vala" + photo_metadata_remove_exif_thumbnail (_tmp71_); +#line 3714 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = photo_has_user_generated_metadata (self); -#line 3712 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3714 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp72_) { -#line 26687 "Photo.c" +#line 26702 "Photo.c" PhotoMetadata* _tmp73_ = NULL; -#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3715 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = metadata; -#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3715 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_user_metadata_for_export (self, _tmp73_); -#line 26693 "Photo.c" +#line 26708 "Photo.c" } } else { PhotoMetadata* _tmp74_ = NULL; -#line 3717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3719 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = metadata; -#line 3717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3719 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_clear (_tmp74_); -#line 26701 "Photo.c" +#line 26716 "Photo.c" } -#line 3724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = photo_get_file_format (self); -#line 3724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3726 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp76_ == PHOTO_FILE_FORMAT_JFIF) { -#line 3724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = TRUE; -#line 26709 "Photo.c" +#line 26724 "Photo.c" } else { PhotoFileFormat _tmp77_ = 0; -#line 3725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = photo_get_file_format (self); -#line 3725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = _tmp77_ == PHOTO_FILE_FORMAT_RAW; -#line 26716 "Photo.c" +#line 26731 "Photo.c" } -#line 3724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3726 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp75_) { -#line 26720 "Photo.c" +#line 26735 "Photo.c" PhotoMetadata* _tmp78_ = NULL; Dimensions _tmp79_ = {0}; PhotoMetadata* _tmp80_ = NULL; Orientation _tmp81_ = 0; -#line 3726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3728 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = metadata; -#line 3726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3728 "/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 3726 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3728 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_pixel_dimensions (_tmp78_, &_tmp79_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = metadata; -#line 3727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3729 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = photo_get_orientation (self); -#line 3727 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3729 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_orientation (_tmp80_, _tmp81_); -#line 26737 "Photo.c" +#line 26752 "Photo.c" } else { PhotoMetadata* _tmp82_ = NULL; GdkPixbuf* _tmp83_ = NULL; Dimensions _tmp84_ = {0}; PhotoMetadata* _tmp85_ = NULL; -#line 3730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = metadata; -#line 3730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3732 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = pixbuf; -#line 3730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3732 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_for_pixbuf (_tmp83_, &_tmp84_); -#line 3730 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3732 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_pixel_dimensions (_tmp82_, &_tmp84_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3733 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = metadata; -#line 3731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3733 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_orientation (_tmp85_, ORIENTATION_TOP_LEFT); -#line 26755 "Photo.c" +#line 26770 "Photo.c" } -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = export_format; -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = dest_file; -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = g_file_get_path (_tmp88_); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tmp89_; -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = photo_file_format_create_metadata_writer (_tmp87_, _tmp90_, &_inner_error_); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = _tmp91_; -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp90_); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = _tmp92_; -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26785 "Photo.c" +#line 26800 "Photo.c" } -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = _tmp86_; -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = NULL; -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = _tmp93_; -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = metadata; -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_metadata_writer_write_metadata (_tmp94_, _tmp95_, &_inner_error_); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp94_); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp86_); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 3734 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3736 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26813 "Photo.c" +#line 26828 "Photo.c" } -#line 3645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp86_); -#line 3645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 3645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); -#line 3645 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3647 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 26823 "Photo.c" +#line 26838 "Photo.c" } @@ -26854,214 +26869,214 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi GFile* _tmp31_ = NULL; GFile* _tmp32_ = NULL; GError * _inner_error_ = NULL; -#line 3737 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3739 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 26857 "Photo.c" +#line 26872 "Photo.c" { PhotoRow* _tmp0_ = NULL; -#line 3739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; -#line 3739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 26864 "Photo.c" +#line 26879 "Photo.c" { PhotoFileFormat _tmp1_ = 0; GFile* _tmp2_ = NULL; -#line 3740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3742 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_file_format (self); -#line 3740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3742 "/home/jens/Source/shotwell/src/Photo.vala" _vala_file_format = _tmp1_; -#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3743 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3743 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (backing); -#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3743 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp2_; -#line 26878 "Photo.c" +#line 26893 "Photo.c" } - __finally385: + __finally386: { PhotoRow* _tmp3_ = NULL; -#line 3739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; -#line 3739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 26887 "Photo.c" +#line 26902 "Photo.c" } -#line 3739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (backing); -#line 3739 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3741 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 26897 "Photo.c" +#line 26912 "Photo.c" } } -#line 3744 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _vala_file_format; -#line 3744 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_file_format_can_write (_tmp4_); -#line 3744 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3746 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp5_) { -#line 26906 "Photo.c" +#line 26921 "Photo.c" PhotoFileFormat _tmp6_ = 0; -#line 3745 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_file_format_get_system_default_format (); -#line 3745 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3747 "/home/jens/Source/shotwell/src/Photo.vala" _vala_file_format = _tmp6_; -#line 26912 "Photo.c" +#line 26927 "Photo.c" } -#line 3748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = g_file_get_basename (backing); -#line 3748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 3748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" disassemble_filename (_tmp8_, &_tmp9_, &_tmp10_); -#line 3748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 3748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" name = _tmp9_; -#line 3748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 3748 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" ext = _tmp10_; -#line 3748 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp8_); #line 3750 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp8_); +#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = ext; -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_ == NULL) { -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; -#line 26936 "Photo.c" +#line 26951 "Photo.c" } else { PhotoFileFormat _tmp13_ = 0; PhotoFileFormatProperties* _tmp14_ = NULL; PhotoFileFormatProperties* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _vala_file_format; -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo_file_format_get_properties (_tmp13_); -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_; -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = ext; -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_file_format_properties_is_recognized_extension (_tmp15_, _tmp16_); -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = !_tmp17_; -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (_tmp15_); -#line 26957 "Photo.c" +#line 26972 "Photo.c" } -#line 3750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3752 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 26961 "Photo.c" +#line 26976 "Photo.c" PhotoFileFormat _tmp18_ = 0; PhotoFileFormatProperties* _tmp19_ = NULL; PhotoFileFormatProperties* _tmp20_ = NULL; gchar* _tmp21_ = NULL; -#line 3751 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _vala_file_format; -#line 3751 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = photo_file_format_get_properties (_tmp18_); -#line 3751 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 3751 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_file_format_properties_get_default_extension (_tmp20_); -#line 3751 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 3751 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" ext = _tmp21_; -#line 3751 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_format_properties_unref0 (_tmp20_); -#line 26980 "Photo.c" +#line 26995 "Photo.c" } -#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = name; -#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _ ("modified"); -#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = ext; -#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = g_strdup_printf ("%s_%s.%s", _tmp22_, _tmp23_, _tmp24_); -#line 3753 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" editable_basename = _tmp25_; -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = g_file_get_parent (backing); -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_; -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = generate_unique_file (_tmp28_, editable_basename, &_tmp29_, &_inner_error_); -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" collision = _tmp29_; -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_; -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp28_); -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp31_; -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (editable_basename); -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (backing); -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 27020 "Photo.c" +#line 27035 "Photo.c" } -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp26_; -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = NULL; -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp32_; -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp26_); -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (editable_basename); -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (backing); -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" if (file_format) { -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" *file_format = _vala_file_format; -#line 27042 "Photo.c" +#line 27057 "Photo.c" } -#line 3756 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3758 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27046 "Photo.c" +#line 27061 "Photo.c" } static void _g_object_unref0_ (gpointer var) { -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 27053 "Photo.c" +#line 27068 "Photo.c" } static void _g_list_free__g_object_unref0_ (GList* self) { -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" g_list_free (self); -#line 27062 "Photo.c" +#line 27077 "Photo.c" } @@ -27099,260 +27114,260 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G GPid _tmp33_ = 0; gboolean _tmp34_ = FALSE; GError * _inner_error_ = NULL; -#line 3759 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3761 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file_format; -#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) { -#line 27106 "Photo.c" +#line 27121 "Photo.c" ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; gchar* _tmp4_ = NULL; -#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = config_facade_get_instance (); -#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3762 "/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 3760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp4_; -#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 27122 "Photo.c" +#line 27137 "Photo.c" } else { ConfigFacade* _tmp5_ = NULL; ConfigFacade* _tmp6_ = NULL; gchar* _tmp7_ = NULL; -#line 3761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = config_facade_get_instance (); -#line 3761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 3761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3763 "/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 3761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp7_; -#line 3761 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp6_); -#line 27139 "Photo.c" +#line 27154 "Photo.c" } -#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_strdup (_tmp0_); -#line 3760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3762 "/home/jens/Source/shotwell/src/Photo.vala" commandline = _tmp8_; -#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3765 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = commandline; -#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3765 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = is_string_empty (_tmp9_); -#line 3763 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3765 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_) { -#line 3764 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3766 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 3764 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3766 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (commandline); -#line 3764 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3766 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3764 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3766 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27159 "Photo.c" +#line 27174 "Photo.c" } { GAppInfo* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; GAppInfo* _tmp13_ = NULL; GAppInfo* _tmp14_ = NULL; -#line 3768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = commandline; -#line 3768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = g_app_info_create_from_commandline (_tmp12_, "", G_APP_INFO_CREATE_NONE, &_inner_error_); -#line 3768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp13_; -#line 3768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27174 "Photo.c" - goto __catch386_g_error; +#line 27189 "Photo.c" + goto __catch387_g_error; } -#line 3768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp11_; -#line 3768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = NULL; -#line 3768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3770 "/home/jens/Source/shotwell/src/Photo.vala" app = _tmp14_; -#line 3767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp11_); -#line 27187 "Photo.c" +#line 27202 "Photo.c" } - goto __finally386; - __catch386_g_error: + goto __finally387; + __catch387_g_error: { GError* er = NULL; -#line 3767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" er = _inner_error_; -#line 3767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3773 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3773 "/home/jens/Source/shotwell/src/Photo.vala" app = NULL; -#line 3767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (er); -#line 27203 "Photo.c" +#line 27218 "Photo.c" } - __finally386: -#line 3767 "/home/jens/Source/shotwell/src/Photo.vala" + __finally387: +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (commandline); -#line 3767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3767 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3769 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 27218 "Photo.c" +#line 27233 "Photo.c" } -#line 3774 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3776 "/home/jens/Source/shotwell/src/Photo.vala" files = NULL; -#line 3775 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = file; -#line 3775 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _g_object_ref0 (_tmp15_); -#line 3775 "/home/jens/Source/shotwell/src/Photo.vala" - files = g_list_insert (files, _tmp16_, -1); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" + files = g_list_insert (files, _tmp16_, -1); +#line 3779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = app; -#line 3777 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3779 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_ != NULL) { -#line 27232 "Photo.c" +#line 27247 "Photo.c" gboolean _tmp18_ = FALSE; GAppInfo* _tmp19_ = NULL; GList* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = app; -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = files; -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = g_app_info_launch (_tmp19_, _tmp20_, NULL, &_inner_error_); -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp21_; -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" __g_list_free__g_object_unref0_0 (files); -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (commandline); -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 27259 "Photo.c" +#line 27274 "Photo.c" } -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp18_; -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" __g_list_free__g_object_unref0_0 (files); -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (commandline); -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27273 "Photo.c" +#line 27288 "Photo.c" } -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = g_new0 (gchar*, 2 + 1); -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" argv = _tmp22_; -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" argv_length1 = 2; -#line 3780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" _argv_size_ = argv_length1; -#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = argv; -#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23__length1 = argv_length1; -#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = commandline; -#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = g_strdup (_tmp24_); -#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp23_[0]); -#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_[0] = _tmp25_; -#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3783 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp23_[0]; -#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = argv; -#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27__length1 = argv_length1; -#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = file; -#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = g_file_get_path (_tmp28_); -#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp27_[1]); -#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_[1] = _tmp29_; -#line 3782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp27_[1]; -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = argv; -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32__length1 = argv_length1; -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = g_spawn_async ("/", _tmp32_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp33_, &_inner_error_); -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" child_pid = _tmp33_; -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp34_; -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" __g_list_free__g_object_unref0_0 (files); -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (commandline); -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 27337 "Photo.c" +#line 27352 "Photo.c" } -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp31_; -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" __g_list_free__g_object_unref0_0 (files); -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (commandline); -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); -#line 3786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3788 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27353 "Photo.c" +#line 27368 "Photo.c" } @@ -27361,25 +27376,25 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error) { GFile* _tmp1_ = NULL; PhotoFileFormat _tmp2_ = 0; GError * _inner_error_ = NULL; -#line 3796 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3798 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 3797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_get_master_file_format (self); -#line 3797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" photo_launch_editor (_tmp1_, _tmp2_, &_inner_error_); -#line 3797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 3797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27380 "Photo.c" +#line 27395 "Photo.c" } } @@ -27398,248 +27413,248 @@ void photo_open_with_external_editor (Photo* self, GError** error) { GFile* _tmp47_ = NULL; PhotoFileFormat _tmp48_ = 0; GError * _inner_error_ = NULL; -#line 3801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3802 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3804 "/home/jens/Source/shotwell/src/Photo.vala" current_editable_file = NULL; -#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3805 "/home/jens/Source/shotwell/src/Photo.vala" create_editable_file = NULL; -#line 27405 "Photo.c" +#line 27420 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 3805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 3805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 27412 "Photo.c" +#line 27427 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; GFile* _tmp6_ = NULL; -#line 3806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3808 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 3806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3808 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 3806 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3808 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 27423 "Photo.c" +#line 27438 "Photo.c" PhotoBackingReaders* _tmp3_ = NULL; PhotoFileReader* _tmp4_ = NULL; GFile* _tmp5_ = NULL; -#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3809 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3809 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->editable; -#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3809 "/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 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3809 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3809 "/home/jens/Source/shotwell/src/Photo.vala" current_editable_file = _tmp5_; -#line 27437 "Photo.c" +#line 27452 "Photo.c" } -#line 3809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = current_editable_file; -#line 3809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3811 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ == NULL) { -#line 27443 "Photo.c" +#line 27458 "Photo.c" GFile* _tmp7_ = NULL; PhotoFileFormat _tmp8_ = 0; GFile* _tmp9_ = NULL; GFile* _tmp10_ = NULL; -#line 3810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_generate_new_editable_file (self, &_tmp8_, &_inner_error_); -#line 3810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" editable_file_format = _tmp8_; -#line 3810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp9_; -#line 3810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27456 "Photo.c" - goto __finally387; +#line 27471 "Photo.c" + goto __finally388; } -#line 3810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp7_; -#line 3810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = NULL; -#line 3810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3810 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" create_editable_file = _tmp10_; -#line 3809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3811 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp7_); -#line 27469 "Photo.c" +#line 27484 "Photo.c" } else { PhotoBackingReaders* _tmp11_ = NULL; PhotoFileReader* _tmp12_ = NULL; PhotoFileFormat _tmp13_ = 0; -#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3814 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->priv->readers; -#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3814 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->editable; -#line 3812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3814 "/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 3812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3814 "/home/jens/Source/shotwell/src/Photo.vala" editable_file_format = _tmp13_; -#line 27482 "Photo.c" +#line 27497 "Photo.c" } } - __finally387: + __finally388: { PhotoBackingReaders* _tmp14_ = NULL; -#line 3805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->priv->readers; -#line 3805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 27492 "Photo.c" +#line 27507 "Photo.c" } -#line 3805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3807 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27504 "Photo.c" +#line 27519 "Photo.c" } } -#line 3817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = create_editable_file; -#line 3817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_ == NULL) { -#line 27511 "Photo.c" +#line 27526 "Photo.c" GFile* _tmp18_ = NULL; -#line 3817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = current_editable_file; -#line 3817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp18_ != NULL; -#line 27517 "Photo.c" +#line 27532 "Photo.c" } else { -#line 3817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = FALSE; -#line 27521 "Photo.c" +#line 27536 "Photo.c" } -#line 3817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_) { -#line 27525 "Photo.c" +#line 27540 "Photo.c" gboolean _tmp19_ = FALSE; GFile* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; -#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = current_editable_file; -#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = g_file_query_exists (_tmp20_, NULL); -#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp21_) { -#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = TRUE; -#line 27537 "Photo.c" +#line 27552 "Photo.c" } else { gboolean _tmp22_ = FALSE; -#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = photo_has_transformations (self); -#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp22_; -#line 27544 "Photo.c" +#line 27559 "Photo.c" } -#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3820 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp19_; -#line 27548 "Photo.c" +#line 27563 "Photo.c" } else { -#line 3817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = FALSE; -#line 27552 "Photo.c" +#line 27567 "Photo.c" } -#line 3817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 27556 "Photo.c" +#line 27571 "Photo.c" GFile* _tmp23_ = NULL; GFile* _tmp24_ = NULL; -#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3821 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = current_editable_file; -#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3821 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _g_object_ref0 (_tmp23_); -#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3821 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3819 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3821 "/home/jens/Source/shotwell/src/Photo.vala" create_editable_file = _tmp24_; -#line 27567 "Photo.c" +#line 27582 "Photo.c" } -#line 3822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = create_editable_file; -#line 3822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp26_ != NULL) { -#line 27573 "Photo.c" +#line 27588 "Photo.c" PhotoFileFormat _tmp27_ = 0; gboolean _tmp28_ = FALSE; -#line 3822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = editable_file_format; -#line 3822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = photo_file_format_can_write (_tmp27_); -#line 3822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp28_; -#line 27582 "Photo.c" +#line 27597 "Photo.c" } else { -#line 3822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = FALSE; -#line 27586 "Photo.c" +#line 27601 "Photo.c" } -#line 3822 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3824 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp25_) { -#line 27590 "Photo.c" +#line 27605 "Photo.c" PhotoFileFormat _tmp40_ = 0; GFile* _tmp41_ = NULL; GFile* _tmp42_ = NULL; GFile* _tmp43_ = NULL; -#line 3823 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3825 "/home/jens/Source/shotwell/src/Photo.vala" photo_halt_monitoring_editable (self); -#line 27597 "Photo.c" +#line 27612 "Photo.c" { GFile* _tmp29_ = NULL; Scaling _tmp30_ = {0}; PhotoFileFormat _tmp31_ = 0; -#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = create_editable_file; -#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" scaling_for_original (&_tmp30_); -#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = editable_file_format; -#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" photo_export (self, _tmp29_, &_tmp30_, JPEG_QUALITY_MAXIMUM, _tmp31_, FALSE, TRUE, &_inner_error_); -#line 3826 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3828 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27612 "Photo.c" - goto __catch388_g_error; +#line 27627 "Photo.c" + goto __catch389_g_error; } } - goto __finally388; - __catch388_g_error: + goto __finally389; + __catch389_g_error: { GError* err = NULL; GError* _tmp38_ = NULL; GError* _tmp39_ = NULL; -#line 3825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 3825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 27626 "Photo.c" +#line 27641 "Photo.c" { GFile* _tmp32_ = NULL; -#line 3831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = create_editable_file; -#line 3831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3833 "/home/jens/Source/shotwell/src/Photo.vala" g_file_delete (_tmp32_, NULL, &_inner_error_); -#line 3831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3833 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27635 "Photo.c" - goto __catch389_g_error; +#line 27650 "Photo.c" + goto __catch390_g_error; } } - goto __finally389; - __catch389_g_error: + goto __finally390; + __catch390_g_error: { GError* delete_err = NULL; GFile* _tmp33_ = NULL; @@ -27647,169 +27662,169 @@ void photo_open_with_external_editor (Photo* self, GError** error) { gchar* _tmp35_ = NULL; GError* _tmp36_ = NULL; const gchar* _tmp37_ = NULL; -#line 3830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" delete_err = _inner_error_; -#line 3830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 3834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = create_editable_file; -#line 3834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = g_file_get_path (_tmp33_); -#line 3834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_; -#line 3834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = delete_err; -#line 3834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_->message; -#line 3834 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:3834: Unable to delete editable file %s after export error:" \ +#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:3836: Unable to delete editable file %s after export error:" \ " %s", _tmp35_, _tmp37_); -#line 3834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3836 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp35_); -#line 3830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (delete_err); -#line 27668 "Photo.c" +#line 27683 "Photo.c" } - __finally389: -#line 3830 "/home/jens/Source/shotwell/src/Photo.vala" + __finally390: +#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 3830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 3830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3832 "/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 3830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 3830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3832 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27687 "Photo.c" +#line 27702 "Photo.c" } -#line 3838 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3840 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = err; -#line 3838 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3840 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _g_error_copy0 (_tmp38_); -#line 3838 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3840 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = _tmp39_; -#line 3838 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3840 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 27697 "Photo.c" - goto __finally388; +#line 27712 "Photo.c" + goto __finally389; } - __finally388: -#line 3825 "/home/jens/Source/shotwell/src/Photo.vala" + __finally389: +#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3827 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27711 "Photo.c" +#line 27726 "Photo.c" } -#line 3842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = editable_file_format; -#line 3842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = create_editable_file; -#line 3842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" photo_attach_editable (self, _tmp40_, _tmp41_, &_inner_error_); -#line 3842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3842 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27729 "Photo.c" +#line 27744 "Photo.c" } -#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = create_editable_file; -#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _g_object_ref0 (_tmp42_); -#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3846 "/home/jens/Source/shotwell/src/Photo.vala" current_editable_file = _tmp43_; -#line 27739 "Photo.c" +#line 27754 "Photo.c" } -#line 3847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = current_editable_file; -#line 3847 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3849 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp44_ != NULL, "current_editable_file != null"); -#line 3850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3852 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = self->priv->editable_monitor; -#line 3850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3852 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp45_ == NULL) { -#line 27749 "Photo.c" +#line 27764 "Photo.c" GFile* _tmp46_ = NULL; -#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = current_editable_file; -#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" photo_start_monitoring_editable (self, _tmp46_, &_inner_error_); -#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27765 "Photo.c" +#line 27780 "Photo.c" } } -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = current_editable_file; -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = photo_get_file_format (self); -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" photo_launch_editor (_tmp47_, _tmp48_, &_inner_error_); -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 3853 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3855 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27784 "Photo.c" +#line 27799 "Photo.c" } -#line 3801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); -#line 3801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 27790 "Photo.c" +#line 27805 "Photo.c" } void photo_revert_to_master (Photo* self, gboolean notify) { gboolean _tmp0_ = FALSE; -#line 3856 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3858 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3859 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = notify; -#line 3857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3859 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, TRUE, TRUE, _tmp0_); -#line 27802 "Photo.c" +#line 27817 "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 3867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3869 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_editable_file_changed ((Photo*) self, file, other_file, event_type); -#line 27809 "Photo.c" +#line 27824 "Photo.c" } @@ -27821,45 +27836,45 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError** GFileMonitor* _tmp4_ = NULL; GFileMonitor* _tmp5_ = NULL; GError * _inner_error_ = NULL; -#line 3860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3862 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3862 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); -#line 3861 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3863 "/home/jens/Source/shotwell/src/Photo.vala" photo_halt_monitoring_editable (self); -#line 3864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3866 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file; -#line 3864 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_blacklist_file (_tmp0_, "Photo.start_monitoring_editable"); #line 3866 "/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" _tmp2_ = file; -#line 3866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = g_file_monitor (_tmp2_, G_FILE_MONITOR_NONE, NULL, &_inner_error_); -#line 3866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp3_; -#line 3866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27843 "Photo.c" +#line 27858 "Photo.c" } -#line 3866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp1_; -#line 3866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 3866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->editable_monitor); -#line 3866 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3868 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->editable_monitor = _tmp4_; -#line 3867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3869 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->priv->editable_monitor; -#line 3867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3869 "/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 3860 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3862 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 27859 "Photo.c" +#line 27874 "Photo.c" } @@ -27871,49 +27886,49 @@ static void photo_halt_monitoring_editable (Photo* self) { GFileMonitor* _tmp4_ = NULL; guint _tmp5_ = 0U; GFileMonitor* _tmp6_ = NULL; -#line 3870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3872 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3873 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->editable_monitor; -#line 3871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3873 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ == NULL) { -#line 3872 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3874 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27879 "Photo.c" +#line 27894 "Photo.c" } -#line 3875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3877 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_editable_file (self); -#line 3875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3877 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp1_; -#line 3876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3878 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = file; -#line 3876 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3878 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 27889 "Photo.c" +#line 27904 "Photo.c" GFile* _tmp3_ = NULL; -#line 3877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; -#line 3877 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3879 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_unblacklist_file (_tmp3_); -#line 27895 "Photo.c" +#line 27910 "Photo.c" } -#line 3879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->editable_monitor; -#line 3879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3881 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_parse_name ("changed", g_file_monitor_get_type (), &_tmp5_, NULL, FALSE); -#line 3879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3881 "/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 3880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->editable_monitor; -#line 3880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3882 "/home/jens/Source/shotwell/src/Photo.vala" g_file_monitor_cancel (_tmp6_); -#line 3881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3883 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->editable_monitor); -#line 3881 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3883 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->editable_monitor = NULL; -#line 3870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3872 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 27913 "Photo.c" +#line 27928 "Photo.c" } @@ -27925,174 +27940,174 @@ static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFi PhotoFileReader* _tmp4_ = NULL; PhotoFileReader* _tmp5_ = NULL; GError * _inner_error_ = NULL; -#line 3884 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3886 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3884 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3886 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); -#line 3889 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3891 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 3890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file_format; -#line 3890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file; -#line 3890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = g_file_get_path (_tmp1_); -#line 3890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 3890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_file_format_create_reader (_tmp0_, _tmp3_); -#line 3890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 3890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" photo_update_editable (self, FALSE, _tmp5_, &_inner_error_); -#line 3890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp5_); -#line 3890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp3_); -#line 3890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3892 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27955 "Photo.c" +#line 27970 "Photo.c" } } static void photo_update_editable_attributes (Photo* self, GError** error) { GError * _inner_error_ = NULL; -#line 3893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3895 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3896 "/home/jens/Source/shotwell/src/Photo.vala" photo_update_editable (self, TRUE, NULL, &_inner_error_); -#line 3894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3896 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3896 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3896 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27972 "Photo.c" +#line 27987 "Photo.c" } } void photo_reimport_editable (Photo* self, GError** error) { GError * _inner_error_ = NULL; -#line 3897 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3899 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3900 "/home/jens/Source/shotwell/src/Photo.vala" photo_update_editable (self, FALSE, NULL, &_inner_error_); -#line 3898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3900 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3900 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3898 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3900 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27989 "Photo.c" +#line 28004 "Photo.c" } } static void _vala_array_add103 (gchar*** array, int* length, int* size, gchar* value) { -#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28001 "Photo.c" +#line 28016 "Photo.c" } -#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28007 "Photo.c" +#line 28022 "Photo.c" } static void _vala_array_add104 (gchar*** array, int* length, int* size, gchar* value) { -#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28018 "Photo.c" +#line 28033 "Photo.c" } -#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28024 "Photo.c" +#line 28039 "Photo.c" } static void _vala_array_add105 (gchar*** array, int* length, int* size, gchar* value) { -#line 4009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 4009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 4009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28035 "Photo.c" +#line 28050 "Photo.c" } -#line 4009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 4009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28041 "Photo.c" +#line 28056 "Photo.c" } static void _vala_array_add106 (gchar*** array, int* length, int* size, gchar* value) { -#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28052 "Photo.c" +#line 28067 "Photo.c" } -#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28058 "Photo.c" +#line 28073 "Photo.c" } static void _vala_array_add107 (gchar*** array, int* length, int* size, gchar* value) { -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28069 "Photo.c" +#line 28084 "Photo.c" } -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28075 "Photo.c" +#line 28090 "Photo.c" } static void _vala_array_add108 (gchar*** array, int* length, int* size, gchar* value) { -#line 4017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { -#line 4017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 4017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28086 "Photo.c" +#line 28101 "Photo.c" } -#line 4017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; -#line 4017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28092 "Photo.c" +#line 28107 "Photo.c" } @@ -28135,168 +28150,168 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF gchar** _tmp131_ = NULL; gint _tmp131__length1 = 0; GError * _inner_error_ = NULL; -#line 3903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 3903 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_if_fail ((new_reader == NULL) || IS_PHOTO_FILE_READER (new_reader)); #line 3905 "/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" _tmp2_ = only_attributes; -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 28143 "Photo.c" +#line 28158 "Photo.c" PhotoFileReader* _tmp3_ = NULL; -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = new_reader; -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp3_ == NULL; -#line 28149 "Photo.c" +#line 28164 "Photo.c" } else { -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 28153 "Photo.c" +#line 28168 "Photo.c" } -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 28159 "Photo.c" +#line 28174 "Photo.c" } else { gboolean _tmp4_ = FALSE; -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = only_attributes; -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = !_tmp4_; -#line 28166 "Photo.c" +#line 28181 "Photo.c" } -#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp0_, "(only_attributes && new_reader == null) || (!only_attributes)"); #line 3907 "/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" _tmp5_ = photo_get_editable_reader (self); -#line 3907 "/home/jens/Source/shotwell/src/Photo.vala" - old_reader = _tmp5_; #line 3909 "/home/jens/Source/shotwell/src/Photo.vala" + old_reader = _tmp5_; +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = new_reader; -#line 3909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp7_; -#line 3909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ == NULL) { -#line 28180 "Photo.c" +#line 28195 "Photo.c" PhotoFileReader* _tmp8_ = NULL; -#line 3909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = old_reader; -#line 3909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp8_; -#line 28186 "Photo.c" +#line 28201 "Photo.c" } -#line 3909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _photo_file_adapter_ref0 (_tmp6_); -#line 3909 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" reader = _tmp9_; -#line 3910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3912 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = reader; -#line 3910 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3912 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_ == NULL) { -#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - photo_detach_editable (self, FALSE, TRUE, TRUE); #line 3913 "/home/jens/Source/shotwell/src/Photo.vala" + photo_detach_editable (self, FALSE, TRUE, TRUE); +#line 3915 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3915 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3913 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3915 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28204 "Photo.c" +#line 28219 "Photo.c" } -#line 3916 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3918 "/home/jens/Source/shotwell/src/Photo.vala" timestamp_changed = FALSE; -#line 3917 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3919 "/home/jens/Source/shotwell/src/Photo.vala" filesize_changed = FALSE; -#line 3918 "/home/jens/Source/shotwell/src/Photo.vala" - is_new_editable = FALSE; #line 3920 "/home/jens/Source/shotwell/src/Photo.vala" + is_new_editable = FALSE; +#line 3922 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_editable_id (self, &_tmp11_); -#line 3920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3922 "/home/jens/Source/shotwell/src/Photo.vala" editable_id = _tmp11_; -#line 3921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = reader; -#line 3921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3923 "/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 3921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3923 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp13_; -#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = file; -#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/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 3924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp15_; -#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" backing = _tmp16_; -#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28246 "Photo.c" +#line 28261 "Photo.c" } -#line 3928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = backing_photo_id_is_invalid (&editable_id); -#line 3928 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_) { -#line 28252 "Photo.c" +#line 28267 "Photo.c" BackingPhotoRow* _tmp18_ = NULL; -#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = backing; -#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_ != NULL) { -#line 28258 "Photo.c" +#line 28273 "Photo.c" BackingPhotoTable* _tmp19_ = NULL; BackingPhotoTable* _tmp20_ = NULL; BackingPhotoRow* _tmp21_ = NULL; -#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = backing_photo_table_get_instance (); -#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = backing; -#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_add (_tmp20_, _tmp21_, &_inner_error_); -#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp20_); -#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3931 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28288 "Photo.c" +#line 28303 "Photo.c" } { PhotoRow* _tmp22_ = NULL; -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = self->row; -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28296 "Photo.c" +#line 28311 "Photo.c" { PhotoTable* _tmp23_ = NULL; PhotoTable* _tmp24_ = NULL; @@ -28309,91 +28324,91 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF BackingPhotoRow* _tmp31_ = NULL; BackingPhotoRow* _tmp32_ = NULL; Orientation _tmp33_ = 0; -#line 3933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3935 "/home/jens/Source/shotwell/src/Photo.vala" timestamp_changed = TRUE; -#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" - filesize_changed = TRUE; #line 3936 "/home/jens/Source/shotwell/src/Photo.vala" + filesize_changed = TRUE; +#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo_table_get_instance (); -#line 3936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_; -#line 3936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->row; -#line 3936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = backing; -#line 3936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_->id; -#line 3936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_attach_editable (_tmp24_, _tmp25_, &_tmp27_, &_inner_error_); -#line 3936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp24_); -#line 3936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 28329 "Photo.c" - goto __finally390; +#line 28344 "Photo.c" + goto __finally391; } -#line 3937 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3939 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = backing; -#line 3937 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3939 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _backing_photo_row_ref0 (_tmp28_); -#line 3937 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3939 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); -#line 3937 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3939 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->editable = _tmp29_; -#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = self->priv->editable; -#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _backing_photo_row_ref0 (_tmp30_); -#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3940 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); -#line 3938 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3940 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = _tmp31_; -#line 3939 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3941 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = self->backing_photo_row; -#line 3939 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3941 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_->original_orientation; -#line 3939 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3941 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp33_); -#line 28354 "Photo.c" +#line 28369 "Photo.c" } - __finally390: + __finally391: { PhotoRow* _tmp34_ = NULL; -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = self->row; -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28363 "Photo.c" +#line 28378 "Photo.c" } -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3934 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28381 "Photo.c" +#line 28396 "Photo.c" } } } -#line 3942 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3944 "/home/jens/Source/shotwell/src/Photo.vala" is_new_editable = TRUE; -#line 28387 "Photo.c" +#line 28402 "Photo.c" } -#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3947 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = only_attributes; -#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3947 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp35_) { -#line 28393 "Photo.c" +#line 28408 "Photo.c" gboolean _tmp36_ = FALSE; GFileInfo* info = NULL; GTimeVal timestamp = {0}; @@ -28406,155 +28421,155 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF glong _tmp51_ = 0L; GFileInfo* _tmp52_ = NULL; gint64 _tmp53_ = 0LL; -#line 3947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = backing_photo_id_is_valid (&editable_id); -#line 3947 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3949 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp36_, "editable_id.is_valid()"); -#line 28410 "Photo.c" +#line 28425 "Photo.c" { GFileInfo* _tmp37_ = NULL; GFile* _tmp38_ = NULL; GFileInfo* _tmp39_ = NULL; GFileInfo* _tmp40_ = NULL; -#line 3951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = file; -#line 3951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = g_file_query_filesystem_info (_tmp38_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, NULL, &_inner_error_); -#line 3951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp39_; -#line 3951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 28424 "Photo.c" - goto __catch391_g_error; +#line 28439 "Photo.c" + goto __catch392_g_error; } -#line 3951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = _tmp37_; -#line 3951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = NULL; -#line 3951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 3951 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" info = _tmp40_; -#line 3950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp37_); -#line 28437 "Photo.c" +#line 28452 "Photo.c" } - goto __finally391; - __catch391_g_error: + goto __finally392; + __catch392_g_error: { GError* err = NULL; gchar* _tmp41_ = NULL; gchar* _tmp42_ = NULL; GError* _tmp43_ = NULL; const gchar* _tmp44_ = NULL; -#line 3950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 3950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3955 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3955 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_; -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3955 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = err; -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3955 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp43_->message; -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:3953: Unable to read editable filesystem info for %s: %s", _tmp42_, _tmp44_); -#line 3953 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp42_); -#line 3954 "/home/jens/Source/shotwell/src/Photo.vala" - photo_detach_editable (self, FALSE, TRUE, TRUE); #line 3956 "/home/jens/Source/shotwell/src/Photo.vala" + photo_detach_editable (self, FALSE, TRUE, TRUE); +#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 3956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 3956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3958 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28481 "Photo.c" +#line 28496 "Photo.c" } - __finally391: -#line 3950 "/home/jens/Source/shotwell/src/Photo.vala" + __finally392: +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 3950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3950 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3952 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28502 "Photo.c" +#line 28517 "Photo.c" } -#line 3959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = info; -#line 3959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" g_file_info_get_modification_time (_tmp45_, &_tmp46_); -#line 3959 "/home/jens/Source/shotwell/src/Photo.vala" - timestamp = _tmp46_; #line 3961 "/home/jens/Source/shotwell/src/Photo.vala" + timestamp = _tmp46_; +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = backing_photo_table_get_instance (); -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_; -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = editable_id; -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = timestamp; -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = _tmp50_.tv_sec; -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = info; -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = g_file_info_get_size (_tmp52_); -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_update_attributes (_tmp48_, &_tmp49_, (time_t) _tmp51_, _tmp53_, &_inner_error_); -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp48_); -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3961 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28546 "Photo.c" +#line 28561 "Photo.c" } { PhotoRow* _tmp54_ = NULL; -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = self->row; -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28554 "Photo.c" +#line 28569 "Photo.c" { BackingPhotoRow* _tmp55_ = NULL; time_t _tmp56_ = 0; @@ -28570,145 +28585,145 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF BackingPhotoRow* _tmp66_ = NULL; GFileInfo* _tmp67_ = NULL; gint64 _tmp68_ = 0LL; -#line 3964 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = self->priv->editable; -#line 3964 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = _tmp55_->timestamp; -#line 3964 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = timestamp; -#line 3964 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = _tmp57_.tv_sec; -#line 3964 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" timestamp_changed = _tmp56_ != ((time_t) _tmp58_); -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3967 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = self->priv->editable; -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3967 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = _tmp59_->filesize; -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3967 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = info; -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3967 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = g_file_info_get_size (_tmp61_); -#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" - filesize_changed = _tmp60_ != _tmp62_; #line 3967 "/home/jens/Source/shotwell/src/Photo.vala" + filesize_changed = _tmp60_ != _tmp62_; +#line 3969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = self->priv->editable; -#line 3967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = timestamp; -#line 3967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = _tmp64_.tv_sec; -#line 3967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_->timestamp = (time_t) _tmp65_; -#line 3968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = self->priv->editable; -#line 3968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = info; -#line 3968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = g_file_info_get_size (_tmp67_); -#line 3968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_->filesize = _tmp68_; -#line 28606 "Photo.c" +#line 28621 "Photo.c" } - __finally392: + __finally393: { PhotoRow* _tmp69_ = NULL; -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = self->row; -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28615 "Photo.c" +#line 28630 "Photo.c" } -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3963 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3965 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28635 "Photo.c" +#line 28650 "Photo.c" } } -#line 3945 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3947 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 28640 "Photo.c" +#line 28655 "Photo.c" } else { gboolean _tmp70_ = FALSE; gboolean _tmp71_ = FALSE; -#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = backing_photo_id_is_valid (&editable_id); -#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp71_) { -#line 28648 "Photo.c" +#line 28663 "Photo.c" gboolean _tmp72_ = FALSE; -#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = is_new_editable; -#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = !_tmp72_; -#line 28654 "Photo.c" +#line 28669 "Photo.c" } else { -#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = FALSE; -#line 28658 "Photo.c" +#line 28673 "Photo.c" } -#line 3972 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3974 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp70_) { -#line 28662 "Photo.c" +#line 28677 "Photo.c" BackingPhotoRow* _tmp73_ = NULL; BackingPhotoID _tmp74_ = {0}; BackingPhotoTable* _tmp75_ = NULL; BackingPhotoTable* _tmp76_ = NULL; BackingPhotoRow* _tmp77_ = NULL; -#line 3977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = backing; -#line 3977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = editable_id; -#line 3977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_->id = _tmp74_; -#line 3978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = backing_photo_table_get_instance (); -#line 3978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = _tmp75_; -#line 3978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = backing; -#line 3978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_update (_tmp76_, _tmp77_, &_inner_error_); -#line 3978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp76_); -#line 3978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28700 "Photo.c" +#line 28715 "Photo.c" } { PhotoRow* _tmp78_ = NULL; -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = self->row; -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28708 "Photo.c" +#line 28723 "Photo.c" { BackingPhotoRow* _tmp79_ = NULL; time_t _tmp80_ = 0; @@ -28724,232 +28739,232 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF BackingPhotoRow* _tmp90_ = NULL; BackingPhotoRow* _tmp91_ = NULL; Orientation _tmp92_ = 0; -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = self->priv->editable; -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = _tmp79_->timestamp; -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = backing; -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = _tmp81_->timestamp; -#line 3980 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" timestamp_changed = _tmp80_ != _tmp82_; -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3983 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = self->priv->editable; -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3983 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = _tmp83_->filesize; -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3983 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = backing; -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3983 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = _tmp85_->filesize; -#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" - filesize_changed = _tmp84_ != _tmp86_; #line 3983 "/home/jens/Source/shotwell/src/Photo.vala" + filesize_changed = _tmp84_ != _tmp86_; +#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = backing; -#line 3983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = _backing_photo_row_ref0 (_tmp87_); -#line 3983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); -#line 3983 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->editable = _tmp88_; -#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = self->priv->editable; -#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _backing_photo_row_ref0 (_tmp89_); -#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); -#line 3984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = _tmp90_; -#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = self->backing_photo_row; -#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = _tmp91_->original_orientation; -#line 3985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3987 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_orientation (self, _tmp92_); -#line 28766 "Photo.c" +#line 28781 "Photo.c" } - __finally393: + __finally394: { PhotoRow* _tmp93_ = NULL; -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = self->row; -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28775 "Photo.c" +#line 28790 "Photo.c" } -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3979 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3981 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28793 "Photo.c" +#line 28808 "Photo.c" } } } } -#line 3991 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = new_reader; -#line 3991 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp94_ != NULL) { -#line 28802 "Photo.c" +#line 28817 "Photo.c" { PhotoBackingReaders* _tmp95_ = NULL; -#line 3992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = self->priv->readers; -#line 3992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 28809 "Photo.c" +#line 28824 "Photo.c" { PhotoBackingReaders* _tmp96_ = NULL; PhotoFileReader* _tmp97_ = NULL; PhotoFileReader* _tmp98_ = NULL; -#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = self->priv->readers; -#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = new_reader; -#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = _photo_file_adapter_ref0 (_tmp97_); -#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3995 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp96_->editable); -#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_->editable = _tmp98_; -#line 28824 "Photo.c" +#line 28839 "Photo.c" } - __finally394: + __finally395: { PhotoBackingReaders* _tmp99_ = NULL; -#line 3992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = self->priv->readers; -#line 3992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 28833 "Photo.c" +#line 28848 "Photo.c" } -#line 3992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 3992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 3992 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3994 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28851 "Photo.c" +#line 28866 "Photo.c" } } } -#line 3997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = only_attributes; -#line 3997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp101_) { -#line 28859 "Photo.c" +#line 28874 "Photo.c" PhotoFileReader* _tmp102_ = NULL; PhotoFileReader* _tmp103_ = NULL; -#line 3997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = reader; -#line 3997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = old_reader; -#line 3997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = _tmp102_ != _tmp103_; -#line 28868 "Photo.c" +#line 28883 "Photo.c" } else { -#line 3997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = FALSE; -#line 28872 "Photo.c" +#line 28887 "Photo.c" } -#line 3997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp100_) { -#line 28876 "Photo.c" +#line 28891 "Photo.c" GFile* _tmp104_ = NULL; PhotoFileReader* _tmp105_ = NULL; GFile* _tmp108_ = NULL; PhotoFileReader* _tmp109_ = NULL; -#line 3998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp105_ = old_reader; -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp105_ != NULL) { -#line 28887 "Photo.c" +#line 28902 "Photo.c" PhotoFileReader* _tmp106_ = NULL; GFile* _tmp107_ = NULL; -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = old_reader; -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/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 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp104_); -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = _tmp107_; -#line 28898 "Photo.c" +#line 28913 "Photo.c" } else { -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp104_); -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = NULL; -#line 28904 "Photo.c" +#line 28919 "Photo.c" } -#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp109_ = new_reader; -#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp109_ != NULL) { -#line 28910 "Photo.c" +#line 28925 "Photo.c" PhotoFileReader* _tmp110_ = NULL; GFile* _tmp111_ = NULL; -#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110_ = new_reader; -#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4002 "/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 4000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp108_); -#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = _tmp111_; -#line 28921 "Photo.c" +#line 28936 "Photo.c" } else { -#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp108_); -#line 4000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = NULL; -#line 28927 "Photo.c" +#line 28942 "Photo.c" } -#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4001 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_editable_replaced (self, _tmp104_, _tmp108_); -#line 3997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp108_); -#line 3997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3999 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp104_); -#line 28935 "Photo.c" +#line 28950 "Photo.c" } -#line 4003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" _tmp112_ = g_new0 (gchar*, 0 + 1); -#line 4003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = _tmp112_; -#line 4003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list_length1 = 0; -#line 4003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_list_size_ = alteration_list_length1; -#line 4004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = timestamp_changed; -#line 4004 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp113_) { -#line 28949 "Photo.c" +#line 28964 "Photo.c" gchar** _tmp114_ = NULL; gint _tmp114__length1 = 0; gchar* _tmp115_ = NULL; @@ -28957,59 +28972,59 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF gint _tmp116__length1 = 0; gchar* _tmp117_ = NULL; gboolean _tmp118_ = FALSE; -#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_ = alteration_list; -#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114__length1 = alteration_list_length1; -#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp115_ = g_strdup ("metadata:editable-timestamp"); -#line 4005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4007 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp115_); -#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" _tmp116_ = alteration_list; -#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" _tmp116__length1 = alteration_list_length1; -#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" _tmp117_ = g_strdup ("metadata:baseline-timestamp"); -#line 4006 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp117_); #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" _tmp118_ = photo_is_editable_source (self); -#line 4008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4010 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp118_) { -#line 28977 "Photo.c" +#line 28992 "Photo.c" gchar** _tmp119_ = NULL; gint _tmp119__length1 = 0; gchar* _tmp120_ = NULL; -#line 4009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" _tmp119_ = alteration_list; -#line 4009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" _tmp119__length1 = alteration_list_length1; -#line 4009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" _tmp120_ = g_strdup ("metadata:source-timestamp"); -#line 4009 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4011 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_); -#line 28989 "Photo.c" +#line 29004 "Photo.c" } } -#line 4012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp122_ = filesize_changed; -#line 4012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp122_) { -#line 4012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = TRUE; -#line 28998 "Photo.c" +#line 29013 "Photo.c" } else { PhotoFileReader* _tmp123_ = NULL; -#line 4012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = new_reader; -#line 4012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = _tmp123_ != NULL; -#line 29005 "Photo.c" +#line 29020 "Photo.c" } -#line 4012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp121_) { -#line 29009 "Photo.c" +#line 29024 "Photo.c" gchar** _tmp124_ = NULL; gint _tmp124__length1 = 0; gchar* _tmp125_ = NULL; @@ -29017,79 +29032,79 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF gint _tmp126__length1 = 0; gchar* _tmp127_ = NULL; gboolean _tmp128_ = FALSE; -#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124_ = alteration_list; -#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124__length1 = alteration_list_length1; -#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp125_ = g_strdup ("image:editable"); -#line 4013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4015 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp125_); -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp126_ = alteration_list; -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp126__length1 = alteration_list_length1; -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" _tmp127_ = g_strdup ("image:baseline"); -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp127_); #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" _tmp128_ = photo_is_editable_source (self); -#line 4016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp128_) { -#line 29037 "Photo.c" +#line 29052 "Photo.c" gchar** _tmp129_ = NULL; gint _tmp129__length1 = 0; gchar* _tmp130_ = NULL; -#line 4017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp129_ = alteration_list; -#line 4017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp129__length1 = alteration_list_length1; -#line 4017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp130_ = g_strdup ("image:source"); -#line 4017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4019 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_); -#line 29049 "Photo.c" +#line 29064 "Photo.c" } } -#line 4020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp131_ = alteration_list; -#line 4020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp131__length1 = alteration_list_length1; -#line 4020 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4022 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp131__length1 > 0) { -#line 29058 "Photo.c" +#line 29073 "Photo.c" gchar** _tmp132_ = NULL; gint _tmp132__length1 = 0; Alteration* _tmp133_ = NULL; Alteration* _tmp134_ = NULL; -#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp132_ = alteration_list; -#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp132__length1 = alteration_list_length1; -#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp133_ = alteration_new_from_array (_tmp132_, _tmp132__length1); -#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4023 "/home/jens/Source/shotwell/src/Photo.vala" _tmp134_ = _tmp133_; -#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4023 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp134_); -#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4023 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp134_); -#line 29075 "Photo.c" +#line 29090 "Photo.c" } -#line 3903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); -#line 3903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); -#line 3903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 3903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 3903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 3903 "/home/jens/Source/shotwell/src/Photo.vala" +#line 3905 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 29089 "Photo.c" +#line 29104 "Photo.c" } @@ -29105,96 +29120,96 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole gboolean _tmp43_ = FALSE; gboolean _tmp44_ = FALSE; GError * _inner_error_ = NULL; -#line 4024 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4026 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4025 "/home/jens/Source/shotwell/src/Photo.vala" - photo_halt_monitoring_editable (self); #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" + photo_halt_monitoring_editable (self); +#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" has_editable = FALSE; -#line 4028 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" editable_file = NULL; -#line 29113 "Photo.c" +#line 29128 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 29120 "Photo.c" +#line 29135 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; -#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 4030 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4032 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 29130 "Photo.c" +#line 29145 "Photo.c" PhotoBackingReaders* _tmp3_ = NULL; PhotoFileReader* _tmp4_ = NULL; GFile* _tmp5_ = NULL; PhotoBackingReaders* _tmp6_ = NULL; -#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; -#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->editable; -#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4033 "/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 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" editable_file = _tmp5_; -#line 4032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->readers; -#line 4032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (_tmp6_->editable); -#line 4032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_->editable = NULL; -#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4035 "/home/jens/Source/shotwell/src/Photo.vala" has_editable = TRUE; -#line 29153 "Photo.c" +#line 29168 "Photo.c" } } - __finally395: + __finally396: { PhotoBackingReaders* _tmp7_ = NULL; -#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; -#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29163 "Photo.c" +#line 29178 "Photo.c" } -#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4031 "/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 4029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4031 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29175 "Photo.c" +#line 29190 "Photo.c" } } -#line 4037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = has_editable; -#line 4037 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4039 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 29182 "Photo.c" +#line 29197 "Photo.c" BackingPhotoID editable_id = {0}; -#line 4038 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4040 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_id_init (&editable_id, BACKING_PHOTO_ID_INVALID); -#line 29186 "Photo.c" +#line 29201 "Photo.c" { { PhotoRow* _tmp9_ = NULL; -#line 4040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; -#line 4040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 29194 "Photo.c" +#line 29209 "Photo.c" { PhotoRow* _tmp10_ = NULL; BackingPhotoID _tmp11_ = {0}; @@ -29202,237 +29217,237 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole PhotoRow* _tmp16_ = NULL; BackingPhotoRow* _tmp17_ = NULL; BackingPhotoRow* _tmp18_ = NULL; -#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4043 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->row; -#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4043 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_->editable_id; -#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4043 "/home/jens/Source/shotwell/src/Photo.vala" editable_id = _tmp11_; -#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4044 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = backing_photo_id_is_valid (&editable_id); -#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4044 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 29212 "Photo.c" +#line 29227 "Photo.c" PhotoTable* _tmp13_ = NULL; PhotoTable* _tmp14_ = NULL; PhotoRow* _tmp15_ = NULL; -#line 4043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_table_get_instance (); -#line 4043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_; -#line 4043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; -#line 4043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_detach_editable (_tmp14_, _tmp15_, &_inner_error_); -#line 4043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp14_); -#line 4043 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4045 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29228 "Photo.c" - goto __finally397; +#line 29243 "Photo.c" + goto __finally398; } } -#line 4044 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->row; -#line 4044 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_->master; -#line 4044 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _backing_photo_row_ref0 (_tmp17_); -#line 4044 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4046 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); -#line 4044 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4046 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_photo_row = _tmp18_; -#line 29242 "Photo.c" +#line 29257 "Photo.c" } - __finally397: + __finally398: { PhotoRow* _tmp19_ = NULL; -#line 4040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = self->row; -#line 4040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 29251 "Photo.c" +#line 29266 "Photo.c" } -#line 4040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 29257 "Photo.c" - goto __catch396_database_error; +#line 29272 "Photo.c" + goto __catch397_database_error; } -#line 4040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/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 4040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4040 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4042 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29268 "Photo.c" +#line 29283 "Photo.c" } } } - goto __finally396; - __catch396_database_error: + goto __finally397; + __catch397_database_error: { GError* err = NULL; GError* _tmp20_ = NULL; const gchar* _tmp21_ = NULL; -#line 4039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 4039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 4047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4049 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = err; -#line 4047 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4049 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_->message; -#line 4047 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4047: Unable to remove editable from PhotoTable: %s", _tmp21_); -#line 4039 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_error_free0 (err); -#line 29290 "Photo.c" +#line 29305 "Photo.c" } - __finally396: -#line 4039 "/home/jens/Source/shotwell/src/Photo.vala" + __finally397: +#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4041 "/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 4039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4041 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29303 "Photo.c" +#line 29318 "Photo.c" } { gboolean _tmp22_ = FALSE; -#line 4051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4053 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = backing_photo_id_is_valid (&editable_id); -#line 4051 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4053 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_) { -#line 29311 "Photo.c" +#line 29326 "Photo.c" BackingPhotoTable* _tmp23_ = NULL; BackingPhotoTable* _tmp24_ = NULL; BackingPhotoID _tmp25_ = {0}; -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = backing_photo_table_get_instance (); -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_; -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = editable_id; -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_remove (_tmp24_, &_tmp25_, &_inner_error_); -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp24_); -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 29329 "Photo.c" - goto __catch398_database_error; +#line 29344 "Photo.c" + goto __catch399_database_error; } -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4054 "/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 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29340 "Photo.c" +#line 29355 "Photo.c" } } } - goto __finally398; - __catch398_database_error: + goto __finally399; + __catch399_database_error: { GError* err = NULL; GError* _tmp26_ = NULL; const gchar* _tmp27_ = NULL; -#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4056 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = err; -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4056 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_->message; -#line 4054 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4054: Unable to remove editable from BackingPhotoTable: %s", _tmp27_); -#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_error_free0 (err); -#line 29362 "Photo.c" +#line 29377 "Photo.c" } - __finally398: -#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" + __finally399: +#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4052 "/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 4050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4050 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4052 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29375 "Photo.c" +#line 29390 "Photo.c" } } -#line 4058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4060 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = remove_transformations; -#line 4058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4060 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_) { -#line 4059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 29384 "Photo.c" +#line 29399 "Photo.c" } -#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4063 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = has_editable; -#line 4061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4063 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_) { -#line 29390 "Photo.c" +#line 29405 "Photo.c" GFile* _tmp30_ = NULL; -#line 4062 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4064 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 4063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4065 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = editable_file; -#line 4063 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4065 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_editable_replaced (self, _tmp30_, NULL); -#line 29398 "Photo.c" +#line 29413 "Photo.c" } -#line 4066 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = delete_editable; -#line 4066 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp32_) { -#line 29404 "Photo.c" +#line 29419 "Photo.c" GFile* _tmp33_ = NULL; -#line 4066 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = editable_file; -#line 4066 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp33_ != NULL; -#line 29410 "Photo.c" +#line 29425 "Photo.c" } else { -#line 4066 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = FALSE; -#line 29414 "Photo.c" +#line 29429 "Photo.c" } -#line 4066 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp31_) { -#line 29418 "Photo.c" +#line 29433 "Photo.c" { GFile* _tmp34_ = NULL; -#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = editable_file; -#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" g_file_trash (_tmp34_, NULL, &_inner_error_); -#line 4068 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29427 "Photo.c" - goto __catch399_g_error; +#line 29442 "Photo.c" + goto __catch400_g_error; } } - goto __finally399; - __catch399_g_error: + goto __finally400; + __catch400_g_error: { GError* err = NULL; GFile* _tmp35_ = NULL; @@ -29442,116 +29457,116 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole gchar* _tmp39_ = NULL; GError* _tmp40_ = NULL; const gchar* _tmp41_ = NULL; -#line 4067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 4067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = editable_file; -#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = g_file_get_path (_tmp35_); -#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_; -#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp38_; -#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = err; -#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_->message; -#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4070: Unable to trash editable %s for %s: %s", _tmp37_, _tmp39_, _tmp41_); -#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp39_); -#line 4070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp37_); -#line 4067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29468 "Photo.c" +#line 29483 "Photo.c" } - __finally399: -#line 4067 "/home/jens/Source/shotwell/src/Photo.vala" + __finally400: +#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 4067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4069 "/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 4067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4069 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29481 "Photo.c" +#line 29496 "Photo.c" } } -#line 4075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = has_editable; -#line 4075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp44_) { -#line 4075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = TRUE; -#line 29490 "Photo.c" +#line 29505 "Photo.c" } else { gboolean _tmp45_ = FALSE; -#line 4075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = remove_transformations; -#line 4075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp45_; -#line 29497 "Photo.c" +#line 29512 "Photo.c" } -#line 4075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp43_) { -#line 29501 "Photo.c" +#line 29516 "Photo.c" gboolean _tmp46_ = FALSE; -#line 4075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = notify; -#line 4075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp46_; -#line 29507 "Photo.c" +#line 29522 "Photo.c" } else { -#line 4075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = FALSE; -#line 29511 "Photo.c" +#line 29526 "Photo.c" } -#line 4075 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4077 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp42_) { -#line 29515 "Photo.c" +#line 29530 "Photo.c" Alteration* _tmp47_ = NULL; Alteration* _tmp48_ = NULL; -#line 4076 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4078 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = alteration_new ("image", "revert"); -#line 4076 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4078 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_; -#line 4076 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4078 "/home/jens/Source/shotwell/src/Photo.vala" data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp48_); -#line 4076 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4078 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp48_); -#line 29526 "Photo.c" +#line 29541 "Photo.c" } -#line 4024 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4026 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 29530 "Photo.c" +#line 29545 "Photo.c" } static void _photo_on_reimport_editable_one_shot_callback (gpointer self) { -#line 4098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4100 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_reimport_editable ((Photo*) self); -#line 29537 "Photo.c" +#line 29552 "Photo.c" } static void _photo_on_update_editable_attributes_one_shot_callback (gpointer self) { -#line 4107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4109 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_update_editable_attributes ((Photo*) self); -#line 29544 "Photo.c" +#line 29559 "Photo.c" } static void _photo_on_remove_editable_one_shot_callback (gpointer self) { -#line 4116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4118 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_remove_editable ((Photo*) self); -#line 29551 "Photo.c" +#line 29566 "Photo.c" } @@ -29563,20 +29578,20 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth gchar* _tmp16_ = NULL; GFileMonitorEvent _tmp17_ = 0; GError * _inner_error_ = NULL; -#line 4079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); -#line 4079 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file)); -#line 29569 "Photo.c" +#line 29584 "Photo.c" { PhotoBackingReaders* _tmp0_ = NULL; -#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; -#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 29576 "Photo.c" +#line 29591 "Photo.c" { PhotoBackingReaders* _tmp1_ = NULL; PhotoFileReader* _tmp2_ = NULL; @@ -29587,181 +29602,181 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth GFile* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; gboolean _tmp9_ = FALSE; -#line 4082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; -#line 4082 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->editable; -#line 4082 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp2_ != NULL, "readers.editable != null"); #line 4084 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_assert (_tmp2_ != NULL, "readers.editable != null"); +#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; -#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; -#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->editable; -#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4086 "/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 4084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_file_equal (_tmp3_, _tmp7_); -#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = !_tmp8_; -#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp7_); -#line 4084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4086 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp9_) { -#line 29611 "Photo.c" +#line 29626 "Photo.c" { PhotoBackingReaders* _tmp10_ = NULL; -#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->priv->readers; -#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29618 "Photo.c" +#line 29633 "Photo.c" } -#line 4088 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4090 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29622 "Photo.c" +#line 29637 "Photo.c" } } - __finally400: + __finally401: { PhotoBackingReaders* _tmp11_ = NULL; -#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->priv->readers; -#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29632 "Photo.c" +#line 29647 "Photo.c" } -#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4083 "/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 4081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4081 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4083 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29642 "Photo.c" +#line 29657 "Photo.c" } } -#line 4092 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = event; -#line 4092 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp12_); -#line 4092 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = file; -#line 4092 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = g_file_get_path (_tmp14_); -#line 4092 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 4092 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4092: EDITABLE %s: %s", (_tmp13_ != NULL) ? _tmp13_->value_name : NULL, _tmp16_); -#line 4092 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp16_); #line 4094 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = event; + g_debug ("Photo.vala:4094: EDITABLE %s: %s", (_tmp13_ != NULL) ? _tmp13_->value_name : NULL, _tmp16_); #line 4094 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp16_); +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp17_ = event; +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" switch (_tmp17_) { -#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CHANGED: -#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CREATED: -#line 29667 "Photo.c" +#line 29682 "Photo.c" { OneShotScheduler* _tmp18_ = NULL; OneShotScheduler* _tmp20_ = NULL; -#line 4097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->priv->reimport_editable_scheduler; -#line 4097 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4099 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_ == NULL) { -#line 29675 "Photo.c" +#line 29690 "Photo.c" OneShotScheduler* _tmp19_ = NULL; -#line 4098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = one_shot_scheduler_new ("Photo.reimport_editable", _photo_on_reimport_editable_one_shot_callback, self); -#line 4098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4100 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->reimport_editable_scheduler); -#line 4098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4100 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->reimport_editable_scheduler = _tmp19_; -#line 29683 "Photo.c" +#line 29698 "Photo.c" } -#line 4102 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4104 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->priv->reimport_editable_scheduler; -#line 4102 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4104 "/home/jens/Source/shotwell/src/Photo.vala" one_shot_scheduler_after_timeout (_tmp20_, (guint) 1000, TRUE); -#line 4103 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29691 "Photo.c" +#line 29706 "Photo.c" } -#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: -#line 29695 "Photo.c" +#line 29710 "Photo.c" { OneShotScheduler* _tmp21_ = NULL; OneShotScheduler* _tmp23_ = NULL; -#line 4106 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4108 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = self->priv->update_editable_attributes_scheduler; -#line 4106 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4108 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_ == NULL) { -#line 29703 "Photo.c" +#line 29718 "Photo.c" OneShotScheduler* _tmp22_ = NULL; -#line 4107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4109 "/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 4107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4109 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->update_editable_attributes_scheduler); -#line 4107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4109 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->update_editable_attributes_scheduler = _tmp22_; -#line 29711 "Photo.c" +#line 29726 "Photo.c" } -#line 4111 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = self->priv->update_editable_attributes_scheduler; -#line 4111 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" one_shot_scheduler_after_timeout (_tmp23_, (guint) 1000, TRUE); -#line 4112 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4114 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29719 "Photo.c" +#line 29734 "Photo.c" } -#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_DELETED: -#line 29723 "Photo.c" +#line 29738 "Photo.c" { OneShotScheduler* _tmp24_ = NULL; OneShotScheduler* _tmp26_ = NULL; -#line 4115 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4117 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = self->priv->remove_editable_scheduler; -#line 4115 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4117 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp24_ == NULL) { -#line 29731 "Photo.c" +#line 29746 "Photo.c" OneShotScheduler* _tmp25_ = NULL; -#line 4116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = one_shot_scheduler_new ("Photo.remove_editable", _photo_on_remove_editable_one_shot_callback, self); -#line 4116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4118 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->remove_editable_scheduler); -#line 4116 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4118 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->remove_editable_scheduler = _tmp25_; -#line 29739 "Photo.c" +#line 29754 "Photo.c" } -#line 4120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4122 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = self->priv->remove_editable_scheduler; -#line 4120 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4122 "/home/jens/Source/shotwell/src/Photo.vala" one_shot_scheduler_after_timeout (_tmp26_, (guint) 3000, TRUE); -#line 4121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4123 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29747 "Photo.c" +#line 29762 "Photo.c" } default: -#line 4094 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -#line 29752 "Photo.c" +#line 29767 "Photo.c" { -#line 4126 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4128 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29756 "Photo.c" +#line 29771 "Photo.c" } } -#line 4131 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4133 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_prefetched (self); -#line 29761 "Photo.c" +#line 29776 "Photo.c" } @@ -29769,67 +29784,67 @@ static void photo_on_reimport_editable (Photo* self) { gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; GError * _inner_error_ = NULL; -#line 4134 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_if_fail (IS_PHOTO (self)); #line 4136 "/home/jens/Source/shotwell/src/Photo.vala" - photo_discard_prefetched (self); + g_return_if_fail (IS_PHOTO (self)); #line 4138 "/home/jens/Source/shotwell/src/Photo.vala" + photo_discard_prefetched (self); +#line 4140 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 4138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4140 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4138 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4138: Reimporting editable for %s", _tmp1_); -#line 4138 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp1_); -#line 29781 "Photo.c" +#line 29796 "Photo.c" { -#line 4140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4142 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable (self, &_inner_error_); -#line 4140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4142 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29787 "Photo.c" - goto __catch401_g_error; +#line 29802 "Photo.c" + goto __catch402_g_error; } } - goto __finally401; - __catch401_g_error: + goto __finally402; + __catch402_g_error: { GError* err = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; GError* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 4139 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 4139 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 4142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4144 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 4142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4144 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 4142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4144 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = err; -#line 4142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4144 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->message; -#line 4142 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4142: Unable to reimport photo %s changed by external edito" \ +#line 4144 "/home/jens/Source/shotwell/src/Photo.vala" + g_warning ("Photo.vala:4144: Unable to reimport photo %s changed by external edito" \ "r: %s", _tmp3_, _tmp5_); -#line 4142 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4144 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp3_); -#line 4139 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29817 "Photo.c" +#line 29832 "Photo.c" } - __finally401: -#line 4139 "/home/jens/Source/shotwell/src/Photo.vala" + __finally402: +#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4139 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4141 "/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 4139 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4139 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4141 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29828 "Photo.c" +#line 29843 "Photo.c" } } @@ -29838,56 +29853,56 @@ static void photo_on_update_editable_attributes (Photo* self) { gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; GError * _inner_error_ = NULL; -#line 4147 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4149 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4150 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 4148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4150 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4148 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4148: Updating editable attributes for %s", _tmp1_); -#line 4148 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp1_); -#line 29847 "Photo.c" +#line 29862 "Photo.c" { -#line 4150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4152 "/home/jens/Source/shotwell/src/Photo.vala" photo_update_editable_attributes (self, &_inner_error_); -#line 4150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4152 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29853 "Photo.c" - goto __catch402_g_error; +#line 29868 "Photo.c" + goto __catch403_g_error; } } - goto __finally402; - __catch402_g_error: + goto __finally403; + __catch403_g_error: { GError* err = NULL; GError* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 4149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4151 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 4149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4151 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 4152 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = err; -#line 4152 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->message; -#line 4152 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4152: Unable to update editable attributes: %s", _tmp3_); -#line 4149 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_error_free0 (err); -#line 29875 "Photo.c" +#line 29890 "Photo.c" } - __finally402: -#line 4149 "/home/jens/Source/shotwell/src/Photo.vala" + __finally403: +#line 4151 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4151 "/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 4149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4151 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4149 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4151 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29886 "Photo.c" +#line 29901 "Photo.c" } } @@ -29903,68 +29918,68 @@ static void photo_on_remove_editable (Photo* self) { gboolean _tmp5_ = FALSE; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 4156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4158 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4157 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4159 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_editable_reader (self); -#line 4157 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4159 "/home/jens/Source/shotwell/src/Photo.vala" reader = _tmp0_; -#line 4158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4160 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = reader; -#line 4158 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4160 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 4159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4161 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 4159 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4161 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29916 "Photo.c" +#line 29931 "Photo.c" } -#line 4161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; -#line 4161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4163 "/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 4161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp3_; -#line 4162 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4164 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = file; -#line 4162 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4164 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = g_file_query_exists (_tmp4_, NULL); -#line 4162 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4164 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 29930 "Photo.c" +#line 29945 "Photo.c" gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; -#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4165 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4165 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4163: Not removing editable for %s: file exists", _tmp7_); -#line 4163 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp7_); #line 4165 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (file); + g_debug ("Photo.vala:4165: Not removing editable for %s: file exists", _tmp7_); #line 4165 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp7_); +#line 4167 "/home/jens/Source/shotwell/src/Photo.vala" + _g_object_unref0 (file); +#line 4167 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 4165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4167 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29947 "Photo.c" +#line 29962 "Photo.c" } -#line 4168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 4168 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 4168 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4168: Removing editable for %s: file no longer exists", _tmp9_); -#line 4168 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp9_); -#line 4169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4171 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, FALSE, TRUE, TRUE); -#line 4156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4158 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 4156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4158 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 29963 "Photo.c" +#line 29978 "Photo.c" } @@ -29975,25 +29990,25 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) { Orientation _tmp1_ = 0; Dimensions _tmp2_ = {0}; Dimensions _tmp3_ = {0}; -#line 4177 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4179 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4180 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_raw_dimensions (self, &_tmp0_); -#line 4178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4180 "/home/jens/Source/shotwell/src/Photo.vala" dim = _tmp0_; -#line 4179 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4181 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_orientation (self); -#line 4179 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp1_; #line 4181 "/home/jens/Source/shotwell/src/Photo.vala" + orientation = _tmp1_; +#line 4183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = dim; -#line 4181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4183 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_dimensions (orientation, &_tmp2_, &_tmp3_); -#line 4181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4183 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp3_; -#line 4181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4183 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29992 "Photo.c" +#line 30007 "Photo.c" } @@ -30001,19 +30016,19 @@ void photo_get_master_dimensions (Photo* self, Dimensions* result) { Orientation _tmp0_ = 0; Dimensions _tmp1_ = {0}; Dimensions _tmp2_ = {0}; -#line 4185 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4187 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4188 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_original_orientation (self); -#line 4186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4188 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_raw_dimensions (self, &_tmp1_); -#line 4186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4188 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_dimensions (_tmp0_, &_tmp1_, &_tmp2_); -#line 4186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4188 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 4186 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4188 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30012 "Photo.c" +#line 30027 "Photo.c" } @@ -30029,77 +30044,77 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { Orientation _tmp3_ = 0; PhotoException _tmp4_ = 0; gboolean _tmp5_ = FALSE; -#line 4190 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 4192 "/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" _tmp1_ = photo_get_raw_crop (self, &_tmp0_); -#line 4192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4194 "/home/jens/Source/shotwell/src/Photo.vala" raw = _tmp0_; -#line 4192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4194 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp1_) { -#line 4193 "/home/jens/Source/shotwell/src/Photo.vala" - box_init (&_vala_crop, 0, 0, 0, 0); #line 4195 "/home/jens/Source/shotwell/src/Photo.vala" + box_init (&_vala_crop, 0, 0, 0, 0); +#line 4197 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 4195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4197 "/home/jens/Source/shotwell/src/Photo.vala" if (crop) { -#line 4195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4197 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 30044 "Photo.c" +#line 30059 "Photo.c" } -#line 4195 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4197 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30048 "Photo.c" +#line 30063 "Photo.c" } -#line 4198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4200 "/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 4198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4200 "/home/jens/Source/shotwell/src/Photo.vala" dim = _tmp2_; -#line 4199 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4201 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_get_orientation (self); -#line 4199 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp3_; #line 4201 "/home/jens/Source/shotwell/src/Photo.vala" + orientation = _tmp3_; +#line 4203 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = exceptions; -#line 4201 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4203 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_exception_allows (_tmp4_, PHOTO_EXCEPTION_ORIENTATION); -#line 4201 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4203 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 30064 "Photo.c" +#line 30079 "Photo.c" Orientation _tmp6_ = 0; Dimensions _tmp7_ = {0}; Box _tmp8_ = {0}; Box _tmp9_ = {0}; -#line 4202 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4204 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = orientation; -#line 4202 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4204 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = dim; -#line 4202 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4204 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = raw; -#line 4202 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4204 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_box (_tmp6_, &_tmp7_, &_tmp8_, &_tmp9_); -#line 4202 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4204 "/home/jens/Source/shotwell/src/Photo.vala" _vala_crop = _tmp9_; -#line 30079 "Photo.c" +#line 30094 "Photo.c" } else { Box _tmp10_ = {0}; -#line 4204 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4206 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = raw; -#line 4204 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4206 "/home/jens/Source/shotwell/src/Photo.vala" _vala_crop = _tmp10_; -#line 30086 "Photo.c" +#line 30101 "Photo.c" } -#line 4206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4208 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4208 "/home/jens/Source/shotwell/src/Photo.vala" if (crop) { -#line 4206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4208 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 30094 "Photo.c" +#line 30109 "Photo.c" } -#line 4206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4208 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30098 "Photo.c" +#line 30113 "Photo.c" } @@ -30137,87 +30152,87 @@ void photo_set_crop (Photo* self, Box* crop) { gint _tmp27_ = 0; gint _tmp28_ = 0; Box _tmp29_ = {0}; -#line 4210 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4212 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4210 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4212 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (crop != NULL); -#line 4211 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4213 "/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 4211 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4213 "/home/jens/Source/shotwell/src/Photo.vala" dim = _tmp0_; -#line 4212 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4214 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_orientation (self); -#line 4212 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp1_; #line 4214 "/home/jens/Source/shotwell/src/Photo.vala" + orientation = _tmp1_; +#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = dim; -#line 4214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = *crop; -#line 4214 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" orientation_derotate_box (orientation, &_tmp2_, &_tmp3_, &_tmp4_); -#line 4214 "/home/jens/Source/shotwell/src/Photo.vala" - derotated = _tmp4_; #line 4216 "/home/jens/Source/shotwell/src/Photo.vala" + derotated = _tmp4_; +#line 4218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = derotated; -#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_.left; -#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = dim; -#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_.width; -#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = CLAMP (_tmp6_, 0, _tmp8_ - 2); -#line 4216 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4218 "/home/jens/Source/shotwell/src/Photo.vala" derotated.left = _tmp9_; -#line 4217 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = derotated; -#line 4217 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_.right; -#line 4217 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = derotated; -#line 4217 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_.left; -#line 4217 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = dim; -#line 4217 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_.width; -#line 4217 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = CLAMP (_tmp11_, _tmp13_, _tmp15_ - 1); -#line 4217 "/home/jens/Source/shotwell/src/Photo.vala" - derotated.right = _tmp16_; #line 4219 "/home/jens/Source/shotwell/src/Photo.vala" + derotated.right = _tmp16_; +#line 4221 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = derotated; -#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4221 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_.top; -#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4221 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = dim; -#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4221 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_.height; -#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4221 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = CLAMP (_tmp18_, 0, _tmp20_ - 2); -#line 4219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4221 "/home/jens/Source/shotwell/src/Photo.vala" derotated.top = _tmp21_; -#line 4220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = derotated; -#line 4220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_.bottom; -#line 4220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = derotated; -#line 4220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_.top; -#line 4220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = dim; -#line 4220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _tmp26_.height; -#line 4220 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = CLAMP (_tmp23_, _tmp25_, _tmp27_ - 1); -#line 4220 "/home/jens/Source/shotwell/src/Photo.vala" - derotated.bottom = _tmp28_; #line 4222 "/home/jens/Source/shotwell/src/Photo.vala" + derotated.bottom = _tmp28_; +#line 4224 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = derotated; -#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4224 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_raw_crop (self, &_tmp29_); -#line 30216 "Photo.c" +#line 30231 "Photo.c" } @@ -30226,49 +30241,49 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) { gboolean result = FALSE; gdouble _tmp0_ = 0.0; gboolean _tmp1_ = FALSE; -#line 4225 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4227 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 4226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4228 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_raw_straighten (self, &_tmp0_); -#line 4226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4228 "/home/jens/Source/shotwell/src/Photo.vala" _vala_theta = _tmp0_; -#line 4226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4228 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp1_) { -#line 4227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4229 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 4227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4229 "/home/jens/Source/shotwell/src/Photo.vala" if (theta) { -#line 4227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4229 "/home/jens/Source/shotwell/src/Photo.vala" *theta = _vala_theta; -#line 30239 "Photo.c" +#line 30254 "Photo.c" } -#line 4227 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4229 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30243 "Photo.c" +#line 30258 "Photo.c" } -#line 4229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4231 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4231 "/home/jens/Source/shotwell/src/Photo.vala" if (theta) { -#line 4229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4231 "/home/jens/Source/shotwell/src/Photo.vala" *theta = _vala_theta; -#line 30251 "Photo.c" +#line 30266 "Photo.c" } -#line 4229 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4231 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30255 "Photo.c" +#line 30270 "Photo.c" } void photo_set_straighten (Photo* self, gdouble theta) { gdouble _tmp0_ = 0.0; -#line 4232 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4234 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4235 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = theta; -#line 4233 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4235 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_raw_straighten (self, _tmp0_); -#line 30267 "Photo.c" +#line 30282 "Photo.c" } @@ -30326,48 +30341,48 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp96__length1 = 0; GdkPixbuf* _tmp133_ = NULL; GdkPixbuf* _tmp134_ = NULL; -#line 4236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 4236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); -#line 4236 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (inst != NULL, NULL); -#line 4246 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4248 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = *inst; -#line 4246 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4248 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_.radius; -#line 4246 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4248 "/home/jens/Source/shotwell/src/Photo.vala" r = (gdouble) _tmp1_; -#line 4247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = *inst; -#line 4247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_.radius; -#line 4247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = g_new0 (gint, _tmp3_ + 1); -#line 4247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4249 "/home/jens/Source/shotwell/src/Photo.vala" x_insets_first_quadrant = _tmp4_; -#line 4247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4249 "/home/jens/Source/shotwell/src/Photo.vala" x_insets_first_quadrant_length1 = _tmp3_ + 1; -#line 4247 "/home/jens/Source/shotwell/src/Photo.vala" - _x_insets_first_quadrant_size_ = x_insets_first_quadrant_length1; #line 4249 "/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" i = 0; -#line 30351 "Photo.c" +#line 30366 "Photo.c" { gdouble y = 0.0; gdouble _tmp5_ = 0.0; -#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = r; -#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" y = _tmp5_; -#line 30359 "Photo.c" +#line 30374 "Photo.c" { gboolean _tmp6_ = FALSE; -#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = TRUE; -#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30366 "Photo.c" +#line 30381 "Photo.c" gdouble _tmp8_ = 0.0; gdouble theta = 0.0; gdouble _tmp9_ = 0.0; @@ -30385,178 +30400,178 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp19_ = 0; gint _tmp20_ = 0; gint _tmp21_ = 0; -#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp6_) { -#line 30386 "Photo.c" +#line 30401 "Photo.c" gdouble _tmp7_ = 0.0; -#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = y; -#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" y = _tmp7_ - 1.0; -#line 30392 "Photo.c" +#line 30407 "Photo.c" } -#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; -#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = y; -#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp8_ >= 0.0)) { -#line 4250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30402 "Photo.c" +#line 30417 "Photo.c" } -#line 4251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = y; -#line 4251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = r; -#line 4251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = asin (_tmp9_ / _tmp10_); -#line 4251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" theta = _tmp11_; -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4254 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = r; -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4254 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = theta; -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4254 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = cos (_tmp13_); -#line 4252 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4254 "/home/jens/Source/shotwell/src/Photo.vala" x = (gint) ((_tmp12_ * _tmp14_) + 0.5); -#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = x_insets_first_quadrant; -#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15__length1 = x_insets_first_quadrant_length1; -#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = i; -#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = *inst; -#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_.radius; -#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = x; -#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_[_tmp16_] = _tmp18_ - _tmp19_; -#line 4253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp15_[_tmp16_]; #line 4255 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp20_ = _tmp15_[_tmp16_]; +#line 4257 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = i; -#line 4255 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4257 "/home/jens/Source/shotwell/src/Photo.vala" i = _tmp21_ + 1; -#line 30440 "Photo.c" +#line 30455 "Photo.c" } } } -#line 4258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = *inst; -#line 4258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_.center; -#line 4258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_.x; -#line 4258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = *inst; -#line 4258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_.radius; -#line 4258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" x_bounds_min = _tmp24_ - _tmp26_; -#line 4259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = *inst; -#line 4259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_.center; -#line 4259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp28_.x; -#line 4259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = *inst; -#line 4259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_.radius; -#line 4259 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" x_bounds_max = _tmp29_ + _tmp31_; -#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = *inst; -#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_.center; -#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_.y; -#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = *inst; -#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = _tmp35_.radius; -#line 4260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" ymin = _tmp34_ - _tmp36_; -#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = ymin; -#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp38_ < 0) { -#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = 0; -#line 30486 "Photo.c" +#line 30501 "Photo.c" } else { gint _tmp39_ = 0; -#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = ymin; -#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp39_; -#line 30493 "Photo.c" +#line 30508 "Photo.c" } -#line 4261 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" ymin = _tmp37_; -#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = *inst; -#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_.center; -#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4264 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_.y; -#line 4262 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4264 "/home/jens/Source/shotwell/src/Photo.vala" ymax = _tmp42_; -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = ymax; -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = pixbuf; -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = gdk_pixbuf_get_height (_tmp45_); -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _tmp46_; -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp44_ > (_tmp47_ - 1)) { -#line 30515 "Photo.c" +#line 30530 "Photo.c" GdkPixbuf* _tmp48_ = NULL; gint _tmp49_ = 0; gint _tmp50_ = 0; -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = pixbuf; -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = gdk_pixbuf_get_height (_tmp48_); -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = _tmp49_; -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp50_ - 1; -#line 30527 "Photo.c" +#line 30542 "Photo.c" } else { gint _tmp51_ = 0; -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = ymax; -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp51_; -#line 30534 "Photo.c" +#line 30549 "Photo.c" } -#line 4263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4265 "/home/jens/Source/shotwell/src/Photo.vala" ymax = _tmp43_; -#line 4267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4269 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = 0; -#line 30540 "Photo.c" +#line 30555 "Photo.c" { gint y_it = 0; gint _tmp52_ = 0; -#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = ymin; -#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" y_it = _tmp52_; -#line 30548 "Photo.c" +#line 30563 "Photo.c" { gboolean _tmp53_ = FALSE; -#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = TRUE; -#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30555 "Photo.c" +#line 30570 "Photo.c" gint _tmp55_ = 0; gint _tmp56_ = 0; gint xmin = 0; @@ -30579,118 +30594,118 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp71_ = 0; gint _tmp72_ = 0; gint _tmp87_ = 0; -#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp53_) { -#line 30580 "Photo.c" +#line 30595 "Photo.c" gint _tmp54_ = 0; -#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = y_it; -#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" y_it = _tmp54_ + 1; -#line 30586 "Photo.c" +#line 30601 "Photo.c" } -#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = FALSE; -#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = y_it; -#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = ymax; -#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp55_ <= _tmp56_)) { -#line 4268 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30598 "Photo.c" +#line 30613 "Photo.c" } -#line 4269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = x_bounds_min; -#line 4269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = x_insets_first_quadrant; -#line 4269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58__length1 = x_insets_first_quadrant_length1; -#line 4269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = inset_index; -#line 4269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = _tmp58_[_tmp59_]; -#line 4269 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" xmin = _tmp57_ + _tmp60_; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = xmin; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp62_ < 0) { -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = 0; -#line 30618 "Photo.c" +#line 30633 "Photo.c" } else { gint _tmp63_ = 0; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = xmin; -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _tmp63_; -#line 30625 "Photo.c" +#line 30640 "Photo.c" } -#line 4270 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" xmin = _tmp61_; -#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = x_bounds_max; -#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = x_insets_first_quadrant; -#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65__length1 = x_insets_first_quadrant_length1; -#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = inset_index; -#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = _tmp65_[_tmp66_]; -#line 4271 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" xmax = _tmp64_ - _tmp67_; -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = xmax; -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = pixbuf; -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = gdk_pixbuf_get_width (_tmp70_); -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = _tmp71_; -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp69_ > (_tmp72_ - 1)) { -#line 30651 "Photo.c" +#line 30666 "Photo.c" GdkPixbuf* _tmp73_ = NULL; gint _tmp74_ = 0; gint _tmp75_ = 0; -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = pixbuf; -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = gdk_pixbuf_get_width (_tmp73_); -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = _tmp74_; -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = _tmp75_ - 1; -#line 30663 "Photo.c" +#line 30678 "Photo.c" } else { gint _tmp76_ = 0; -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = xmax; -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = _tmp76_; -#line 30670 "Photo.c" +#line 30685 "Photo.c" } -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" xmax = _tmp68_; -#line 30674 "Photo.c" +#line 30689 "Photo.c" { gint x_it = 0; gint _tmp77_ = 0; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = xmin; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" x_it = _tmp77_; -#line 30682 "Photo.c" +#line 30697 "Photo.c" { gboolean _tmp78_ = FALSE; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = TRUE; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30689 "Photo.c" +#line 30704 "Photo.c" gint _tmp80_ = 0; gint _tmp81_ = 0; GdkPixbuf* _tmp82_ = NULL; @@ -30698,94 +30713,94 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp84_ = 0; GdkPixbuf* _tmp85_ = NULL; GdkPixbuf* _tmp86_ = NULL; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp78_) { -#line 30699 "Photo.c" +#line 30714 "Photo.c" gint _tmp79_ = 0; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = x_it; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" x_it = _tmp79_ + 1; -#line 30705 "Photo.c" +#line 30720 "Photo.c" } -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = FALSE; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = x_it; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = xmax; -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp80_ <= _tmp81_)) { -#line 4274 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4276 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30717 "Photo.c" +#line 30732 "Photo.c" } -#line 4275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = pixbuf; -#line 4275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = x_it; -#line 4275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = y_it; -#line 4275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = photo_red_reduce_pixel (self, _tmp82_, _tmp83_, _tmp84_); -#line 4275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = _tmp85_; -#line 4275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp86_); -#line 30731 "Photo.c" +#line 30746 "Photo.c" } } } -#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4279 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = inset_index; -#line 4277 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4279 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = _tmp87_ + 1; -#line 30739 "Photo.c" +#line 30754 "Photo.c" } } } -#line 4282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = *inst; -#line 4282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = _tmp88_.center; -#line 4282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tmp89_.y; -#line 4282 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" ymin = _tmp90_; -#line 4283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = *inst; -#line 4283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = _tmp91_.center; -#line 4283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = _tmp92_.y; -#line 4283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = *inst; -#line 4283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp95_ = _tmp94_.radius; -#line 4283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" ymax = _tmp93_ + _tmp95_; -#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4286 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = x_insets_first_quadrant; -#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4286 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96__length1 = x_insets_first_quadrant_length1; -#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4286 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = _tmp96__length1 - 1; -#line 30769 "Photo.c" +#line 30784 "Photo.c" { gint y_it = 0; gint _tmp97_ = 0; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = ymin; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" y_it = _tmp97_; -#line 30777 "Photo.c" +#line 30792 "Photo.c" { gboolean _tmp98_ = FALSE; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = TRUE; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30784 "Photo.c" +#line 30799 "Photo.c" gint _tmp100_ = 0; gint _tmp101_ = 0; gint xmin = 0; @@ -30808,118 +30823,118 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp116_ = 0; gint _tmp117_ = 0; gint _tmp132_ = 0; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp98_) { -#line 30809 "Photo.c" +#line 30824 "Photo.c" gint _tmp99_ = 0; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = y_it; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" y_it = _tmp99_ + 1; -#line 30815 "Photo.c" +#line 30830 "Photo.c" } -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = FALSE; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = y_it; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = ymax; -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp100_ <= _tmp101_)) { -#line 4285 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30827 "Photo.c" +#line 30842 "Photo.c" } -#line 4286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = x_bounds_min; -#line 4286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = x_insets_first_quadrant; -#line 4286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103__length1 = x_insets_first_quadrant_length1; -#line 4286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = inset_index; -#line 4286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" _tmp105_ = _tmp103_[_tmp104_]; -#line 4286 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" xmin = _tmp102_ + _tmp105_; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp107_ = xmin; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp107_ < 0) { -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = 0; -#line 30847 "Photo.c" +#line 30862 "Photo.c" } else { gint _tmp108_ = 0; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp108_ = xmin; -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = _tmp108_; -#line 30854 "Photo.c" +#line 30869 "Photo.c" } -#line 4287 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" xmin = _tmp106_; -#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp109_ = x_bounds_max; -#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110_ = x_insets_first_quadrant; -#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110__length1 = x_insets_first_quadrant_length1; -#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp111_ = inset_index; -#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp112_ = _tmp110_[_tmp111_]; -#line 4288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4290 "/home/jens/Source/shotwell/src/Photo.vala" xmax = _tmp109_ - _tmp112_; -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_ = xmax; -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp115_ = pixbuf; -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp116_ = gdk_pixbuf_get_width (_tmp115_); -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp117_ = _tmp116_; -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp114_ > (_tmp117_ - 1)) { -#line 30880 "Photo.c" +#line 30895 "Photo.c" GdkPixbuf* _tmp118_ = NULL; gint _tmp119_ = 0; gint _tmp120_ = 0; -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp118_ = pixbuf; -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp119_ = gdk_pixbuf_get_width (_tmp118_); -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp120_ = _tmp119_; -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = _tmp120_ - 1; -#line 30892 "Photo.c" +#line 30907 "Photo.c" } else { gint _tmp121_ = 0; -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = xmax; -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = _tmp121_; -#line 30899 "Photo.c" +#line 30914 "Photo.c" } -#line 4289 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" xmax = _tmp113_; -#line 30903 "Photo.c" +#line 30918 "Photo.c" { gint x_it = 0; gint _tmp122_ = 0; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp122_ = xmin; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" x_it = _tmp122_; -#line 30911 "Photo.c" +#line 30926 "Photo.c" { gboolean _tmp123_ = FALSE; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = TRUE; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30918 "Photo.c" +#line 30933 "Photo.c" gint _tmp125_ = 0; gint _tmp126_ = 0; GdkPixbuf* _tmp127_ = NULL; @@ -30927,63 +30942,63 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp129_ = 0; GdkPixbuf* _tmp130_ = NULL; GdkPixbuf* _tmp131_ = NULL; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp123_) { -#line 30928 "Photo.c" +#line 30943 "Photo.c" gint _tmp124_ = 0; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124_ = x_it; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" x_it = _tmp124_ + 1; -#line 30934 "Photo.c" +#line 30949 "Photo.c" } -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = FALSE; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp125_ = x_it; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp126_ = xmax; -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp125_ <= _tmp126_)) { -#line 4291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30946 "Photo.c" +#line 30961 "Photo.c" } -#line 4292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp127_ = pixbuf; -#line 4292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp128_ = x_it; -#line 4292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp129_ = y_it; -#line 4292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp130_ = photo_red_reduce_pixel (self, _tmp127_, _tmp128_, _tmp129_); -#line 4292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp131_ = _tmp130_; -#line 4292 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp131_); -#line 30960 "Photo.c" +#line 30975 "Photo.c" } } } -#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp132_ = inset_index; -#line 4294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4296 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = _tmp132_ - 1; -#line 30968 "Photo.c" +#line 30983 "Photo.c" } } } -#line 4297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4299 "/home/jens/Source/shotwell/src/Photo.vala" _tmp133_ = pixbuf; -#line 4297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4299 "/home/jens/Source/shotwell/src/Photo.vala" _tmp134_ = _g_object_ref0 (_tmp133_); -#line 4297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4299 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp134_; -#line 4297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4299 "/home/jens/Source/shotwell/src/Photo.vala" x_insets_first_quadrant = (g_free (x_insets_first_quadrant), NULL); -#line 4297 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4299 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30982 "Photo.c" +#line 30997 "Photo.c" } @@ -31002,89 +31017,89 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x gint _tmp9_ = 0; GdkPixbuf* _tmp33_ = NULL; GdkPixbuf* _tmp34_ = NULL; -#line 4300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4302 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 4300 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4302 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); -#line 4301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = y; -#line 4301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = pixbuf; -#line 4301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gdk_pixbuf_get_rowstride (_tmp1_); -#line 4301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = x; -#line 4301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = pixbuf; -#line 4301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_); -#line 4301 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4303 "/home/jens/Source/shotwell/src/Photo.vala" px_start_byte_offset = (_tmp0_ * _tmp2_) + (_tmp3_ * _tmp5_); -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = x; -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp9_ >= 0) { -#line 31023 "Photo.c" +#line 31038 "Photo.c" gint _tmp10_ = 0; -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = y; -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp10_ >= 0; -#line 31029 "Photo.c" +#line 31044 "Photo.c" } else { -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = FALSE; -#line 31033 "Photo.c" +#line 31048 "Photo.c" } -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 31037 "Photo.c" +#line 31052 "Photo.c" gint _tmp11_ = 0; GdkPixbuf* _tmp12_ = NULL; gint _tmp13_ = 0; gint _tmp14_ = 0; -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = x; -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = pixbuf; -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = gdk_pixbuf_get_width (_tmp12_); -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_; -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp11_ < _tmp14_; -#line 31052 "Photo.c" +#line 31067 "Photo.c" } else { -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = FALSE; -#line 31056 "Photo.c" +#line 31071 "Photo.c" } -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_) { -#line 31060 "Photo.c" +#line 31075 "Photo.c" gint _tmp15_ = 0; GdkPixbuf* _tmp16_ = NULL; gint _tmp17_ = 0; gint _tmp18_ = 0; -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = y; -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = pixbuf; -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = gdk_pixbuf_get_height (_tmp16_); -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_; -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp15_ < _tmp18_; -#line 31075 "Photo.c" +#line 31090 "Photo.c" } else { -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; -#line 31079 "Photo.c" +#line 31094 "Photo.c" } -#line 4308 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 31083 "Photo.c" +#line 31098 "Photo.c" guchar* pixel_data = NULL; GdkPixbuf* _tmp19_ = NULL; guint8* _tmp20_ = NULL; @@ -31108,65 +31123,65 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x gint _tmp30_ = 0; guchar _tmp31_ = '\0'; guchar _tmp32_ = '\0'; -#line 4309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = pixbuf; -#line 4309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = gdk_pixbuf_get_pixels (_tmp19_); -#line 4309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4311 "/home/jens/Source/shotwell/src/Photo.vala" pixel_data = _tmp20_; -#line 4309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4311 "/home/jens/Source/shotwell/src/Photo.vala" pixel_data_length1 = -1; -#line 4309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4311 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_data_size_ = pixel_data_length1; -#line 4319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4321 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = pixel_data; -#line 4319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4321 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21__length1 = pixel_data_length1; -#line 4319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4321 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = px_start_byte_offset; -#line 4319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4321 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp21_[_tmp22_ + 1]; -#line 4319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4321 "/home/jens/Source/shotwell/src/Photo.vala" g = _tmp23_; -#line 4320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = pixel_data; -#line 4320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24__length1 = pixel_data_length1; -#line 4320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = px_start_byte_offset; -#line 4320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp24_[_tmp25_ + 2]; -#line 4320 "/home/jens/Source/shotwell/src/Photo.vala" - b = _tmp26_; #line 4322 "/home/jens/Source/shotwell/src/Photo.vala" + b = _tmp26_; +#line 4324 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = g; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4324 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = b; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - r = (guchar) ((_tmp27_ + _tmp28_) / 2); #line 4324 "/home/jens/Source/shotwell/src/Photo.vala" + r = (guchar) ((_tmp27_ + _tmp28_) / 2); +#line 4326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = pixel_data; -#line 4324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29__length1 = pixel_data_length1; -#line 4324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = px_start_byte_offset; -#line 4324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = r; -#line 4324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_[_tmp30_] = _tmp31_; -#line 4324 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4326 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp29_[_tmp30_]; -#line 31155 "Photo.c" +#line 31170 "Photo.c" } -#line 4327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = pixbuf; -#line 4327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _g_object_ref0 (_tmp33_); -#line 4327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp34_; -#line 4327 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31165 "Photo.c" +#line 31180 "Photo.c" } @@ -31191,78 +31206,78 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin gint _tmp15_ = 0; gint _tmp16_ = 0; gint _tmp17_ = 0; -#line 4330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4332 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4332 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (unscaled_point != NULL); -#line 4331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4333 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_orientation (self); -#line 4331 "/home/jens/Source/shotwell/src/Photo.vala" - unscaled_orientation = _tmp0_; #line 4333 "/home/jens/Source/shotwell/src/Photo.vala" + unscaled_orientation = _tmp0_; +#line 4335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = unscaled_orientation; -#line 4333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4335 "/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 4333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4335 "/home/jens/Source/shotwell/src/Photo.vala" orientation_rotate_dimensions (_tmp1_, &_tmp2_, &_tmp3_); -#line 4333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4335 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_dims = _tmp3_; -#line 4336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4338 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_x_offset_raw = 0; -#line 4337 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4339 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_y_offset_raw = 0; -#line 4340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_get_raw_crop (self, &_tmp4_); -#line 4340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4342 "/home/jens/Source/shotwell/src/Photo.vala" crop_box = _tmp4_; -#line 4340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4342 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 31216 "Photo.c" +#line 31231 "Photo.c" Box _tmp6_ = {0}; gint _tmp7_ = 0; Box _tmp8_ = {0}; gint _tmp9_ = 0; -#line 4341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4343 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = crop_box; -#line 4341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4343 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_.left; -#line 4341 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4343 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_x_offset_raw = _tmp7_; -#line 4342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4344 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = crop_box; -#line 4342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4344 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_.top; -#line 4342 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4344 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_y_offset_raw = _tmp9_; -#line 31233 "Photo.c" +#line 31248 "Photo.c" } -#line 4345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = unscaled_orientation; -#line 4345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = unscaled_dims; -#line 4345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = *unscaled_point; -#line 4345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4347 "/home/jens/Source/shotwell/src/Photo.vala" orientation_derotate_point (_tmp10_, &_tmp11_, &_tmp12_, &_tmp13_); -#line 4345 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4347 "/home/jens/Source/shotwell/src/Photo.vala" derotated_point = _tmp13_; -#line 4349 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4351 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = derotated_point.x; -#line 4349 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4351 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = unscaled_x_offset_raw; -#line 4349 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4351 "/home/jens/Source/shotwell/src/Photo.vala" derotated_point.x = _tmp14_ + _tmp15_; -#line 4350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4352 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = derotated_point.y; -#line 4350 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4352 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = unscaled_y_offset_raw; -#line 4350 "/home/jens/Source/shotwell/src/Photo.vala" - derotated_point.y = _tmp16_ + _tmp17_; #line 4352 "/home/jens/Source/shotwell/src/Photo.vala" + derotated_point.y = _tmp16_ + _tmp17_; +#line 4354 "/home/jens/Source/shotwell/src/Photo.vala" *result = derotated_point; -#line 4352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4354 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 31261 "Photo.c" +#line 31276 "Photo.c" } @@ -31308,171 +31323,171 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe gint _tmp45_ = 0; GdkPoint _tmp46_ = {0}; gint _tmp47_ = 0; -#line 4355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4357 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 4355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4357 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (unscaled_rect != NULL); -#line 4356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4358 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_.x = 0; -#line 4356 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4358 "/home/jens/Source/shotwell/src/Photo.vala" upper_left = _tmp0_; -#line 4357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4359 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_.x = 0; -#line 4357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4359 "/home/jens/Source/shotwell/src/Photo.vala" lower_right = _tmp1_; -#line 4358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = *unscaled_rect; -#line 4358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_.x; -#line 4358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4360 "/home/jens/Source/shotwell/src/Photo.vala" upper_left.x = _tmp3_; -#line 4359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = *unscaled_rect; -#line 4359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_.y; -#line 4359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" upper_left.y = _tmp5_; -#line 4360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = upper_left; -#line 4360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_.x; -#line 4360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = *unscaled_rect; -#line 4360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_.width; -#line 4360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4362 "/home/jens/Source/shotwell/src/Photo.vala" lower_right.x = _tmp7_ + _tmp9_; -#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = upper_left; -#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_.y; -#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = *unscaled_rect; -#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_.height; -#line 4361 "/home/jens/Source/shotwell/src/Photo.vala" - lower_right.y = _tmp11_ + _tmp13_; #line 4363 "/home/jens/Source/shotwell/src/Photo.vala" + lower_right.y = _tmp11_ + _tmp13_; +#line 4365 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = upper_left; -#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4365 "/home/jens/Source/shotwell/src/Photo.vala" photo_unscaled_to_raw_point (self, &_tmp14_, &_tmp15_); -#line 4363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4365 "/home/jens/Source/shotwell/src/Photo.vala" upper_left = _tmp15_; -#line 4364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = lower_right; -#line 4364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" photo_unscaled_to_raw_point (self, &_tmp16_, &_tmp17_); -#line 4364 "/home/jens/Source/shotwell/src/Photo.vala" - lower_right = _tmp17_; #line 4366 "/home/jens/Source/shotwell/src/Photo.vala" + lower_right = _tmp17_; +#line 4368 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = upper_left; -#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4368 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_.x; -#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4368 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = lower_right; -#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4368 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_.x; -#line 4366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4368 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_ > _tmp21_) { -#line 31373 "Photo.c" +#line 31388 "Photo.c" gint temp = 0; GdkPoint _tmp22_ = {0}; gint _tmp23_ = 0; GdkPoint _tmp24_ = {0}; gint _tmp25_ = 0; gint _tmp26_ = 0; -#line 4367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4369 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = upper_left; -#line 4367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4369 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _tmp22_.x; -#line 4367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4369 "/home/jens/Source/shotwell/src/Photo.vala" temp = _tmp23_; -#line 4368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4370 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = lower_right; -#line 4368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4370 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_.x; -#line 4368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4370 "/home/jens/Source/shotwell/src/Photo.vala" upper_left.x = _tmp25_; -#line 4369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4371 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = temp; -#line 4369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4371 "/home/jens/Source/shotwell/src/Photo.vala" lower_right.x = _tmp26_; -#line 31396 "Photo.c" +#line 31411 "Photo.c" } -#line 4371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = upper_left; -#line 4371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp27_.y; -#line 4371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = lower_right; -#line 4371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _tmp29_.y; -#line 4371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_ > _tmp30_) { -#line 31408 "Photo.c" +#line 31423 "Photo.c" gint temp = 0; GdkPoint _tmp31_ = {0}; gint _tmp32_ = 0; GdkPoint _tmp33_ = {0}; gint _tmp34_ = 0; gint _tmp35_ = 0; -#line 4372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = upper_left; -#line 4372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4374 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_.y; -#line 4372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4374 "/home/jens/Source/shotwell/src/Photo.vala" temp = _tmp32_; -#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4375 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = lower_right; -#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4375 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp33_.y; -#line 4373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4375 "/home/jens/Source/shotwell/src/Photo.vala" upper_left.y = _tmp34_; -#line 4374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4376 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = temp; -#line 4374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4376 "/home/jens/Source/shotwell/src/Photo.vala" lower_right.y = _tmp35_; -#line 31431 "Photo.c" +#line 31446 "Photo.c" } -#line 4377 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4379 "/home/jens/Source/shotwell/src/Photo.vala" memset (&raw_rect, 0, sizeof (GdkRectangle)); -#line 4378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = upper_left; -#line 4378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_.x; -#line 4378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" raw_rect.x = _tmp37_; -#line 4379 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = upper_left; -#line 4379 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tmp38_.y; -#line 4379 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" raw_rect.y = _tmp39_; -#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = lower_right; -#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_.x; -#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = upper_left; -#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _tmp42_.x; -#line 4380 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4382 "/home/jens/Source/shotwell/src/Photo.vala" raw_rect.width = _tmp41_ - _tmp43_; -#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = lower_right; -#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp44_.y; -#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = upper_left; -#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4383 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _tmp46_.y; -#line 4381 "/home/jens/Source/shotwell/src/Photo.vala" - raw_rect.height = _tmp45_ - _tmp47_; #line 4383 "/home/jens/Source/shotwell/src/Photo.vala" + raw_rect.height = _tmp45_ - _tmp47_; +#line 4385 "/home/jens/Source/shotwell/src/Photo.vala" *result = raw_rect; -#line 4383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4385 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 31471 "Photo.c" +#line 31486 "Photo.c" } @@ -31483,85 +31498,85 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { GdkPixbuf* _tmp4_ = NULL; PixelTransformationBundle* _tmp5_ = NULL; GError * _inner_error_ = NULL; -#line 4386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4388 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 4387 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4389 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = NULL; -#line 31486 "Photo.c" +#line 31501 "Photo.c" { GdkPixbuf* _tmp0_ = NULL; Scaling _tmp1_ = {0}; GdkPixbuf* _tmp2_ = NULL; GdkPixbuf* _tmp3_ = NULL; -#line 4394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" scaling_for_best_fit (360, FALSE, &_tmp1_); -#line 4394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4396 "/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 4394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp2_; -#line 4394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 31500 "Photo.c" - goto __catch403_g_error; +#line 31515 "Photo.c" + goto __catch404_g_error; } -#line 4394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp0_; -#line 4394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 4394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 4394 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4396 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp3_; -#line 4393 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 31513 "Photo.c" +#line 31528 "Photo.c" } - goto __finally403; - __catch403_g_error: + goto __finally404; + __catch404_g_error: { GError* e = NULL; -#line 4393 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; -#line 4393 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 4401 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4401: %s", "Photo: get_enhance_transformations: couldn't obtain pixbuf to build " "transform histogram"); #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" result = NULL; -#line 4403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4405 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 4403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4405 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 4403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4405 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31533 "Photo.c" +#line 31548 "Photo.c" } - __finally403: -#line 4393 "/home/jens/Source/shotwell/src/Photo.vala" + __finally404: +#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4393 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 4393 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4395 "/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 4393 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4393 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4395 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 31546 "Photo.c" +#line 31561 "Photo.c" } -#line 4410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4412 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = pixbuf; -#line 4410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4412 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = auto_enhance_create_auto_enhance_adjustments (_tmp4_); -#line 4410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4412 "/home/jens/Source/shotwell/src/Photo.vala" transformations = _tmp5_; -#line 4418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4420 "/home/jens/Source/shotwell/src/Photo.vala" result = transformations; -#line 4418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4420 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 4418 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4420 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31560 "Photo.c" +#line 31575 "Photo.c" } @@ -31571,68 +31586,68 @@ gboolean photo_enhance (Photo* self) { PixelTransformationBundle* _tmp0_ = NULL; PixelTransformationBundle* _tmp1_ = NULL; GError * _inner_error_ = NULL; -#line 4421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4423 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 4422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4424 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_get_enhance_transformations (self); -#line 4422 "/home/jens/Source/shotwell/src/Photo.vala" - transformations = _tmp0_; #line 4424 "/home/jens/Source/shotwell/src/Photo.vala" + transformations = _tmp0_; +#line 4426 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = transformations; -#line 4424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4426 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 4425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4427 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 4425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4427 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (transformations); -#line 4425 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4427 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31586 "Photo.c" +#line 31601 "Photo.c" } { PhotoRow* _tmp2_ = NULL; -#line 4430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->row; -#line 4430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 31594 "Photo.c" +#line 31609 "Photo.c" { PixelTransformationBundle* _tmp3_ = NULL; -#line 4431 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4433 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = transformations; -#line 4431 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4433 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_color_adjustments (self, _tmp3_); -#line 31601 "Photo.c" +#line 31616 "Photo.c" } - __finally404: + __finally405: { PhotoRow* _tmp4_ = NULL; -#line 4430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; -#line 4430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 31610 "Photo.c" +#line 31625 "Photo.c" } -#line 4430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (transformations); -#line 4430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4432 "/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 4430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 4430 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4432 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 31622 "Photo.c" +#line 31637 "Photo.c" } } -#line 4438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4440 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4440 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (transformations); -#line 4438 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4440 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31631 "Photo.c" +#line 31646 "Photo.c" } @@ -31645,7 +31660,7 @@ gboolean photo_get_develop_raw_photos_to_files (void) { result = _tmp0_; #line 349 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31644 "Photo.c" +#line 31659 "Photo.c" } @@ -31655,7 +31670,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 31654 "Photo.c" +#line 31669 "Photo.c" } @@ -31664,7 +31679,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 31663 "Photo.c" +#line 31678 "Photo.c" } @@ -31683,19 +31698,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 31682 "Photo.c" +#line 31697 "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 31688 "Photo.c" +#line 31703 "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 31694 "Photo.c" +#line 31709 "Photo.c" } @@ -31710,7 +31725,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 31709 "Photo.c" +#line 31724 "Photo.c" } @@ -31729,47 +31744,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 31728 "Photo.c" +#line 31743 "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 31734 "Photo.c" +#line 31749 "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 31740 "Photo.c" +#line 31755 "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 31747 "Photo.c" +#line 31762 "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 31754 "Photo.c" +#line 31769 "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 31761 "Photo.c" +#line 31776 "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 31768 "Photo.c" +#line 31783 "Photo.c" } @@ -31837,14 +31852,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 31836 "Photo.c" +#line 31851 "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 31843 "Photo.c" +#line 31858 "Photo.c" } @@ -31859,7 +31874,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 31858 "Photo.c" +#line 31873 "Photo.c" } @@ -31877,7 +31892,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 31876 "Photo.c" +#line 31891 "Photo.c" } @@ -31891,7 +31906,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 31890 "Photo.c" +#line 31905 "Photo.c" PixelTransformer* _tmp2_ = NULL; PixelTransformer* _tmp3_ = NULL; #line 269 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31902,19 +31917,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 31901 "Photo.c" +#line 31916 "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 31907 "Photo.c" +#line 31922 "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 31913 "Photo.c" +#line 31928 "Photo.c" } @@ -31928,7 +31943,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 31927 "Photo.c" +#line 31942 "Photo.c" PixelTransformationBundle* _tmp2_ = NULL; PixelTransformationBundle* _tmp3_ = NULL; #line 273 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31939,19 +31954,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 31938 "Photo.c" +#line 31953 "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 31944 "Photo.c" +#line 31959 "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 31950 "Photo.c" +#line 31965 "Photo.c" } @@ -31970,13 +31985,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 31969 "Photo.c" +#line 31984 "Photo.c" } #line 281 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, 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 31975 "Photo.c" +#line 31990 "Photo.c" { GeeIterator* _object_it = NULL; GeeHashMap* _tmp2_ = NULL; @@ -32003,7 +32018,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 32002 "Photo.c" +#line 32017 "Photo.c" GeeIterator* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; gchar* object = NULL; @@ -32025,7 +32040,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G if (!_tmp9_) { #line 282 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 32024 "Photo.c" +#line 32039 "Photo.c" } #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _object_it; @@ -32057,17 +32072,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 32056 "Photo.c" +#line 32071 "Photo.c" } #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 32060 "Photo.c" +#line 32075 "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 32066 "Photo.c" +#line 32081 "Photo.c" } @@ -32081,7 +32096,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_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState), "broken"); -#line 32080 "Photo.c" +#line 32095 "Photo.c" } } @@ -32093,14 +32108,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 32092 "Photo.c" +#line 32107 "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 32099 "Photo.c" +#line 32114 "Photo.c" } @@ -32126,7 +32141,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 32125 "Photo.c" +#line 32140 "Photo.c" } @@ -32148,21 +32163,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 32147 "Photo.c" +#line 32162 "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 32154 "Photo.c" +#line 32169 "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 32161 "Photo.c" +#line 32176 "Photo.c" } @@ -32171,7 +32186,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 32170 "Photo.c" +#line 32185 "Photo.c" } } @@ -32181,11 +32196,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 32180 "Photo.c" +#line 32195 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32184 "Photo.c" +#line 32199 "Photo.c" } } @@ -32193,37 +32208,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 32192 "Photo.c" +#line 32207 "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 32199 "Photo.c" +#line 32214 "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 32206 "Photo.c" +#line 32221 "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 32210 "Photo.c" +#line 32225 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_backing_readers_ref (object); -#line 32214 "Photo.c" +#line 32229 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32218 "Photo.c" +#line 32233 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32222 "Photo.c" +#line 32237 "Photo.c" } @@ -32234,25 +32249,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 32233 "Photo.c" +#line 32248 "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 32239 "Photo.c" +#line 32254 "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 32243 "Photo.c" +#line 32258 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_backing_readers_ref (value->data[0].v_pointer); -#line 32247 "Photo.c" +#line 32262 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32251 "Photo.c" +#line 32266 "Photo.c" } @@ -32266,7 +32281,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 32265 "Photo.c" +#line 32280 "Photo.c" } @@ -32275,7 +32290,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 32274 "Photo.c" +#line 32289 "Photo.c" } @@ -32295,17 +32310,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 32294 "Photo.c" +#line 32309 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32298 "Photo.c" +#line 32313 "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 32304 "Photo.c" +#line 32319 "Photo.c" } } @@ -32324,17 +32339,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 32323 "Photo.c" +#line 32338 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32327 "Photo.c" +#line 32342 "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 32333 "Photo.c" +#line 32348 "Photo.c" } } @@ -32344,14 +32359,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 32343 "Photo.c" +#line 32358 "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 32350 "Photo.c" +#line 32365 "Photo.c" } @@ -32367,7 +32382,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 32366 "Photo.c" +#line 32381 "Photo.c" } @@ -32392,7 +32407,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 32391 "Photo.c" +#line 32406 "Photo.c" } @@ -32405,7 +32420,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 32404 "Photo.c" +#line 32419 "Photo.c" } } @@ -32440,21 +32455,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 32439 "Photo.c" +#line 32454 "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 32446 "Photo.c" +#line 32461 "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 32453 "Photo.c" +#line 32468 "Photo.c" } @@ -32463,7 +32478,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 32462 "Photo.c" +#line 32477 "Photo.c" } } @@ -32473,11 +32488,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 32472 "Photo.c" +#line 32487 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32476 "Photo.c" +#line 32491 "Photo.c" } } @@ -32485,37 +32500,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 32484 "Photo.c" +#line 32499 "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 32491 "Photo.c" +#line 32506 "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 32498 "Photo.c" +#line 32513 "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 32502 "Photo.c" +#line 32517 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_cached_pixbuf_ref (object); -#line 32506 "Photo.c" +#line 32521 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32510 "Photo.c" +#line 32525 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32514 "Photo.c" +#line 32529 "Photo.c" } @@ -32526,25 +32541,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 32525 "Photo.c" +#line 32540 "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 32531 "Photo.c" +#line 32546 "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 32535 "Photo.c" +#line 32550 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_cached_pixbuf_ref (value->data[0].v_pointer); -#line 32539 "Photo.c" +#line 32554 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32543 "Photo.c" +#line 32558 "Photo.c" } @@ -32558,7 +32573,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 32557 "Photo.c" +#line 32572 "Photo.c" } @@ -32567,7 +32582,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 32566 "Photo.c" +#line 32581 "Photo.c" } @@ -32587,17 +32602,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 32586 "Photo.c" +#line 32601 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32590 "Photo.c" +#line 32605 "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 32596 "Photo.c" +#line 32611 "Photo.c" } } @@ -32616,17 +32631,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 32615 "Photo.c" +#line 32630 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32619 "Photo.c" +#line 32634 "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 32625 "Photo.c" +#line 32640 "Photo.c" } } @@ -32636,7 +32651,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 32635 "Photo.c" +#line 32650 "Photo.c" } @@ -32648,7 +32663,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 32647 "Photo.c" +#line 32662 "Photo.c" } @@ -32664,7 +32679,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 32663 "Photo.c" +#line 32678 "Photo.c" } @@ -32689,7 +32704,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 32688 "Photo.c" +#line 32703 "Photo.c" } @@ -32702,224 +32717,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 32701 "Photo.c" +#line 32716 "Photo.c" } } PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_type) { PhotoReimportMasterState* self = NULL; -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportMasterState*) g_type_create_instance (object_type); -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32712 "Photo.c" +#line 32727 "Photo.c" } static void photo_value_reimport_master_state_init (GValue* value) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32719 "Photo.c" +#line 32734 "Photo.c" } static void photo_value_reimport_master_state_free_value (GValue* value) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (value->data[0].v_pointer); -#line 32728 "Photo.c" +#line 32743 "Photo.c" } } static void photo_value_reimport_master_state_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/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 32738 "Photo.c" +#line 32753 "Photo.c" } else { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32742 "Photo.c" +#line 32757 "Photo.c" } } static gpointer photo_value_reimport_master_state_peek_pointer (const GValue* value) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32750 "Photo.c" +#line 32765 "Photo.c" } static gchar* photo_value_reimport_master_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 32757 "Photo.c" +#line 32772 "Photo.c" PhotoReimportMasterState* object; object = collect_values[0].v_pointer; -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32764 "Photo.c" +#line 32779 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/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 32768 "Photo.c" +#line 32783 "Photo.c" } -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_master_state_ref (object); -#line 32772 "Photo.c" +#line 32787 "Photo.c" } else { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32776 "Photo.c" +#line 32791 "Photo.c" } -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32780 "Photo.c" +#line 32795 "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 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 32791 "Photo.c" +#line 32806 "Photo.c" } -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 32797 "Photo.c" +#line 32812 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 32801 "Photo.c" +#line 32816 "Photo.c" } else { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_master_state_ref (value->data[0].v_pointer); -#line 32805 "Photo.c" +#line 32820 "Photo.c" } -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32809 "Photo.c" +#line 32824 "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 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/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 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 32823 "Photo.c" +#line 32838 "Photo.c" } gpointer photo_value_get_reimport_master_state (const GValue* value) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/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 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32832 "Photo.c" +#line 32847 "Photo.c" } void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) { PhotoReimportMasterState* old; -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE)); -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_MASTER_STATE)); -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/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 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_ref (value->data[0].v_pointer); -#line 32852 "Photo.c" +#line 32867 "Photo.c" } else { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32856 "Photo.c" +#line 32871 "Photo.c" } -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (old); -#line 32862 "Photo.c" +#line 32877 "Photo.c" } } void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) { PhotoReimportMasterState* old; -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE)); -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_MASTER_STATE)); -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/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 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 32881 "Photo.c" +#line 32896 "Photo.c" } else { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32885 "Photo.c" +#line 32900 "Photo.c" } -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (old); -#line 32891 "Photo.c" +#line 32906 "Photo.c" } } static void photo_reimport_master_state_class_init (PhotoReimportMasterStateClass * klass) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_parent_class = g_type_class_peek_parent (klass); -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_finalize; -#line 32901 "Photo.c" +#line 32916 "Photo.c" } static void photo_reimport_master_state_instance_init (PhotoReimportMasterState * self) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 32908 "Photo.c" +#line 32923 "Photo.c" } static void photo_reimport_master_state_finalize (PhotoReimportMasterState* obj) { PhotoReimportMasterState * self; -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 32918 "Photo.c" +#line 32933 "Photo.c" } @@ -32940,24 +32955,24 @@ GType photo_reimport_master_state_get_type (void) { gpointer photo_reimport_master_state_ref (gpointer instance) { PhotoReimportMasterState* self; self = instance; -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 32943 "Photo.c" +#line 32958 "Photo.c" } void photo_reimport_master_state_unref (gpointer instance) { PhotoReimportMasterState* self; self = instance; -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_MASTER_STATE_GET_CLASS (self)->finalize (self); -#line 1348 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 32956 "Photo.c" +#line 32971 "Photo.c" } } @@ -32965,21 +32980,21 @@ void photo_reimport_master_state_unref (gpointer instance) { static gchar** _vala_array_dup28 (gchar** self, int length) { gchar** result; int i; -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" result = g_new0 (gchar*, length + 1); -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" for (i = 0; i < length; i++) { -#line 32968 "Photo.c" +#line 32983 "Photo.c" gchar* _tmp0_ = NULL; -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = g_strdup (self[i]); -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" result[i] = _tmp0_; -#line 32974 "Photo.c" +#line 32989 "Photo.c" } -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32978 "Photo.c" +#line 32993 "Photo.c" } @@ -32993,91 +33008,91 @@ static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct gint _tmp4__length1 = 0; gchar** _tmp5_ = NULL; gint _tmp5__length1 = 0; -#line 1357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_ROW (row), NULL); -#line 1357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL); -#line 1357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportMasterStateImpl*) photo_reimport_master_state_construct (object_type); -#line 1358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = row; -#line 1358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _photo_row_ref0 (_tmp0_); -#line 1358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (self->row); -#line 1358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" self->row = _tmp1_; -#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1361 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1361 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _media_metadata_ref0 (_tmp2_); -#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1361 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1361 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata = _tmp3_; -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = alterations; -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4__length1 = alterations_length1; -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup28 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_); -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5__length1 = _tmp4__length1; -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL); -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" self->alterations = _tmp5_; -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" self->alterations_length1 = _tmp5__length1; -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1362 "/home/jens/Source/shotwell/src/Photo.vala" self->_alterations_size_ = self->alterations_length1; -#line 1357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1359 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33032 "Photo.c" +#line 33047 "Photo.c" } static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) { -#line 1357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1359 "/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 33039 "Photo.c" +#line 33054 "Photo.c" } static void photo_reimport_master_state_impl_class_init (PhotoReimportMasterStateImplClass * klass) { -#line 1351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_impl_parent_class = g_type_class_peek_parent (klass); -#line 1351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_impl_finalize; -#line 33048 "Photo.c" +#line 33063 "Photo.c" } static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterStateImpl * self) { PhotoRow* _tmp0_ = NULL; -#line 1352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_row_new (); -#line 1352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1354 "/home/jens/Source/shotwell/src/Photo.vala" self->row = _tmp0_; -#line 1355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1357 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 33060 "Photo.c" +#line 33075 "Photo.c" } static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState* obj) { PhotoReimportMasterStateImpl * self; -#line 1351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl); -#line 1352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1354 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (self->row); -#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1355 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 1354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1356 "/home/jens/Source/shotwell/src/Photo.vala" self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL); -#line 1351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1353 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_MASTER_STATE_CLASS (photo_reimport_master_state_impl_parent_class)->finalize (obj); -#line 33076 "Photo.c" +#line 33091 "Photo.c" } @@ -33095,217 +33110,217 @@ static GType photo_reimport_master_state_impl_get_type (void) { PhotoReimportEditableState* photo_reimport_editable_state_construct (GType object_type) { PhotoReimportEditableState* self = NULL; -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportEditableState*) g_type_create_instance (object_type); -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33098 "Photo.c" +#line 33113 "Photo.c" } static void photo_value_reimport_editable_state_init (GValue* value) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33105 "Photo.c" +#line 33120 "Photo.c" } static void photo_value_reimport_editable_state_free_value (GValue* value) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (value->data[0].v_pointer); -#line 33114 "Photo.c" +#line 33129 "Photo.c" } } static void photo_value_reimport_editable_state_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/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 33124 "Photo.c" +#line 33139 "Photo.c" } else { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 33128 "Photo.c" +#line 33143 "Photo.c" } } static gpointer photo_value_reimport_editable_state_peek_pointer (const GValue* value) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33136 "Photo.c" +#line 33151 "Photo.c" } static gchar* photo_value_reimport_editable_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 33143 "Photo.c" +#line 33158 "Photo.c" PhotoReimportEditableState* object; object = collect_values[0].v_pointer; -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33150 "Photo.c" +#line 33165 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/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 33154 "Photo.c" +#line 33169 "Photo.c" } -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_editable_state_ref (object); -#line 33158 "Photo.c" +#line 33173 "Photo.c" } else { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33162 "Photo.c" +#line 33177 "Photo.c" } -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33166 "Photo.c" +#line 33181 "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 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33177 "Photo.c" +#line 33192 "Photo.c" } -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33183 "Photo.c" +#line 33198 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33187 "Photo.c" +#line 33202 "Photo.c" } else { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_editable_state_ref (value->data[0].v_pointer); -#line 33191 "Photo.c" +#line 33206 "Photo.c" } -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33195 "Photo.c" +#line 33210 "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 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/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 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33209 "Photo.c" +#line 33224 "Photo.c" } gpointer photo_value_get_reimport_editable_state (const GValue* value) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/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 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33218 "Photo.c" +#line 33233 "Photo.c" } void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object) { PhotoReimportEditableState* old; -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE)); -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_EDITABLE_STATE)); -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/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 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_ref (value->data[0].v_pointer); -#line 33238 "Photo.c" +#line 33253 "Photo.c" } else { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33242 "Photo.c" +#line 33257 "Photo.c" } -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (old); -#line 33248 "Photo.c" +#line 33263 "Photo.c" } } void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object) { PhotoReimportEditableState* old; -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE)); -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_EDITABLE_STATE)); -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/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 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33267 "Photo.c" +#line 33282 "Photo.c" } else { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33271 "Photo.c" +#line 33286 "Photo.c" } -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (old); -#line 33277 "Photo.c" +#line 33292 "Photo.c" } } static void photo_reimport_editable_state_class_init (PhotoReimportEditableStateClass * klass) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_parent_class = g_type_class_peek_parent (klass); -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_finalize; -#line 33287 "Photo.c" +#line 33302 "Photo.c" } static void photo_reimport_editable_state_instance_init (PhotoReimportEditableState * self) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33294 "Photo.c" +#line 33309 "Photo.c" } static void photo_reimport_editable_state_finalize (PhotoReimportEditableState* obj) { PhotoReimportEditableState * self; -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState); -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 33304 "Photo.c" +#line 33319 "Photo.c" } @@ -33326,24 +33341,24 @@ GType photo_reimport_editable_state_get_type (void) { gpointer photo_reimport_editable_state_ref (gpointer instance) { PhotoReimportEditableState* self; self = instance; -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 33329 "Photo.c" +#line 33344 "Photo.c" } void photo_reimport_editable_state_unref (gpointer instance) { PhotoReimportEditableState* self; self = instance; -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_EDITABLE_STATE_GET_CLASS (self)->finalize (self); -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1366 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 33342 "Photo.c" +#line 33357 "Photo.c" } } @@ -33354,73 +33369,73 @@ static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_constr BackingPhotoRow* _tmp1_ = NULL; PhotoMetadata* _tmp2_ = NULL; PhotoMetadata* _tmp3_ = NULL; -#line 1372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing_state), NULL); -#line 1372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL); -#line 1372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportEditableStateImpl*) photo_reimport_editable_state_construct (object_type); -#line 1373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1375 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing_state; -#line 1373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1375 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _backing_photo_row_ref0 (_tmp0_); -#line 1373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1375 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_state); -#line 1373 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1375 "/home/jens/Source/shotwell/src/Photo.vala" self->backing_state = _tmp1_; -#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1376 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1376 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _media_metadata_ref0 (_tmp2_); -#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1376 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1376 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata = _tmp3_; -#line 1372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33377 "Photo.c" +#line 33392 "Photo.c" } static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata) { -#line 1372 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1374 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_editable_state_impl_construct (PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, backing_state, metadata); -#line 33384 "Photo.c" +#line 33399 "Photo.c" } static void photo_reimport_editable_state_impl_class_init (PhotoReimportEditableStateImplClass * klass) { -#line 1367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_impl_parent_class = g_type_class_peek_parent (klass); -#line 1367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_impl_finalize; -#line 33393 "Photo.c" +#line 33408 "Photo.c" } static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEditableStateImpl * self) { BackingPhotoRow* _tmp0_ = NULL; -#line 1368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1370 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing_photo_row_new (); -#line 1368 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_state = _tmp0_; #line 1370 "/home/jens/Source/shotwell/src/Photo.vala" + self->backing_state = _tmp0_; +#line 1372 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 33405 "Photo.c" +#line 33420 "Photo.c" } static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState* obj) { PhotoReimportEditableStateImpl * self; -#line 1367 "/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_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl); -#line 1368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1370 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_state); -#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1371 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 1367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1369 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_EDITABLE_STATE_CLASS (photo_reimport_editable_state_impl_parent_class)->finalize (obj); -#line 33419 "Photo.c" +#line 33434 "Photo.c" } @@ -33438,217 +33453,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 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportRawDevelopmentState*) g_type_create_instance (object_type); -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33441 "Photo.c" +#line 33456 "Photo.c" } static void photo_value_reimport_raw_development_state_init (GValue* value) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33448 "Photo.c" +#line 33463 "Photo.c" } static void photo_value_reimport_raw_development_state_free_value (GValue* value) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (value->data[0].v_pointer); -#line 33457 "Photo.c" +#line 33472 "Photo.c" } } static void photo_value_reimport_raw_development_state_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/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 33467 "Photo.c" +#line 33482 "Photo.c" } else { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 33471 "Photo.c" +#line 33486 "Photo.c" } } static gpointer photo_value_reimport_raw_development_state_peek_pointer (const GValue* value) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33479 "Photo.c" +#line 33494 "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 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 33486 "Photo.c" +#line 33501 "Photo.c" PhotoReimportRawDevelopmentState* object; object = collect_values[0].v_pointer; -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33493 "Photo.c" +#line 33508 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/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 33497 "Photo.c" +#line 33512 "Photo.c" } -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_raw_development_state_ref (object); -#line 33501 "Photo.c" +#line 33516 "Photo.c" } else { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33505 "Photo.c" +#line 33520 "Photo.c" } -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33509 "Photo.c" +#line 33524 "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 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33520 "Photo.c" +#line 33535 "Photo.c" } -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33526 "Photo.c" +#line 33541 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33530 "Photo.c" +#line 33545 "Photo.c" } else { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_raw_development_state_ref (value->data[0].v_pointer); -#line 33534 "Photo.c" +#line 33549 "Photo.c" } -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33538 "Photo.c" +#line 33553 "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 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/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 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33552 "Photo.c" +#line 33567 "Photo.c" } gpointer photo_value_get_reimport_raw_development_state (const GValue* value) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/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 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33561 "Photo.c" +#line 33576 "Photo.c" } void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_object) { PhotoReimportRawDevelopmentState* old; -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE)); -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/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 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/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 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_ref (value->data[0].v_pointer); -#line 33581 "Photo.c" +#line 33596 "Photo.c" } else { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33585 "Photo.c" +#line 33600 "Photo.c" } -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (old); -#line 33591 "Photo.c" +#line 33606 "Photo.c" } } void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object) { PhotoReimportRawDevelopmentState* old; -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE)); -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/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 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/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 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33610 "Photo.c" +#line 33625 "Photo.c" } else { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33614 "Photo.c" +#line 33629 "Photo.c" } -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (old); -#line 33620 "Photo.c" +#line 33635 "Photo.c" } } static void photo_reimport_raw_development_state_class_init (PhotoReimportRawDevelopmentStateClass * klass) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_parent_class = g_type_class_peek_parent (klass); -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_finalize; -#line 33630 "Photo.c" +#line 33645 "Photo.c" } static void photo_reimport_raw_development_state_instance_init (PhotoReimportRawDevelopmentState * self) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33637 "Photo.c" +#line 33652 "Photo.c" } static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState* obj) { PhotoReimportRawDevelopmentState * self; -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState); -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 33647 "Photo.c" +#line 33662 "Photo.c" } @@ -33669,42 +33684,42 @@ GType photo_reimport_raw_development_state_get_type (void) { gpointer photo_reimport_raw_development_state_ref (gpointer instance) { PhotoReimportRawDevelopmentState* self; self = instance; -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 33672 "Photo.c" +#line 33687 "Photo.c" } void photo_reimport_raw_development_state_unref (gpointer instance) { PhotoReimportRawDevelopmentState* self; self = instance; -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_GET_CLASS (self)->finalize (self); -#line 1378 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 33685 "Photo.c" +#line 33700 "Photo.c" } } static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_construct (GType object_type) { PhotoReimportRawDevelopmentStateImpl* self = NULL; -#line 1395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1397 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportRawDevelopmentStateImpl*) photo_reimport_raw_development_state_construct (object_type); -#line 1395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1397 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33696 "Photo.c" +#line 33711 "Photo.c" } static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void) { -#line 1395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1397 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_raw_development_state_impl_construct (PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL); -#line 33703 "Photo.c" +#line 33718 "Photo.c" } @@ -33714,27 +33729,27 @@ static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevel PhotoMetadata* _tmp2_ = NULL; PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp3_ = NULL; PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp4_ = NULL; -#line 1398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1400 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self)); -#line 1398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1400 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_BACKING_PHOTO_ROW (backing)); -#line 1398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1400 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->list; -#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = backing; -#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_reimport_raw_development_state_impl_dev_to_reimport_new (_tmp1_, _tmp2_); -#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" gee_collection_add (_tmp0_, _tmp4_); -#line 1399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1401 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (_tmp4_); -#line 33733 "Photo.c" +#line 33748 "Photo.c" } @@ -33743,19 +33758,19 @@ static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRaw GeeCollection* _tmp0_ = NULL; gint _tmp1_ = 0; gint _tmp2_ = 0; -#line 1402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1404 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self), 0); -#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1405 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->list; -#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1405 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_collection_get_size (_tmp0_); -#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1405 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1405 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 1403 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1405 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 33754 "Photo.c" +#line 33769 "Photo.c" } @@ -33765,253 +33780,253 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev BackingPhotoRow* _tmp1_ = NULL; PhotoMetadata* _tmp2_ = NULL; PhotoMetadata* _tmp3_ = NULL; -#line 1386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing), NULL); -#line 1386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL); -#line 1386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportRawDevelopmentStateImplDevToReimport*) g_type_create_instance (object_type); -#line 1387 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1389 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing; -#line 1387 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1389 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _backing_photo_row_ref0 (_tmp0_); -#line 1387 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1389 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing); -#line 1387 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1389 "/home/jens/Source/shotwell/src/Photo.vala" self->backing = _tmp1_; -#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _media_metadata_ref0 (_tmp2_); -#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1390 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1390 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata = _tmp3_; -#line 1386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1388 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33788 "Photo.c" +#line 33803 "Photo.c" } static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, PhotoMetadata* metadata) { -#line 1386 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1388 "/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 33795 "Photo.c" +#line 33810 "Photo.c" } static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_init (GValue* value) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33802 "Photo.c" +#line 33817 "Photo.c" } static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_free_value (GValue* value) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (value->data[0].v_pointer); -#line 33811 "Photo.c" +#line 33826 "Photo.c" } } static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/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 33821 "Photo.c" +#line 33836 "Photo.c" } else { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 33825 "Photo.c" +#line 33840 "Photo.c" } } static gpointer photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer (const GValue* value) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33833 "Photo.c" +#line 33848 "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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 33840 "Photo.c" +#line 33855 "Photo.c" PhotoReimportRawDevelopmentStateImplDevToReimport* object; object = collect_values[0].v_pointer; -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33847 "Photo.c" +#line 33862 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/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 33851 "Photo.c" +#line 33866 "Photo.c" } -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (object); -#line 33855 "Photo.c" +#line 33870 "Photo.c" } else { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33859 "Photo.c" +#line 33874 "Photo.c" } -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33863 "Photo.c" +#line 33878 "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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33874 "Photo.c" +#line 33889 "Photo.c" } -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33880 "Photo.c" +#line 33895 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33884 "Photo.c" +#line 33899 "Photo.c" } else { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/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 33888 "Photo.c" +#line 33903 "Photo.c" } -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33892 "Photo.c" +#line 33907 "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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33906 "Photo.c" +#line 33921 "Photo.c" } static gpointer photo_reimport_raw_development_state_impl_value_get_dev_to_reimport (const GValue* value) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33915 "Photo.c" +#line 33930 "Photo.c" } static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, gpointer v_object) { PhotoReimportRawDevelopmentStateImplDevToReimport* old; -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer); -#line 33935 "Photo.c" +#line 33950 "Photo.c" } else { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33939 "Photo.c" +#line 33954 "Photo.c" } -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old); -#line 33945 "Photo.c" +#line 33960 "Photo.c" } } static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, gpointer v_object) { PhotoReimportRawDevelopmentStateImplDevToReimport* old; -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" old = value->data[0].v_pointer; -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (v_object) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33964 "Photo.c" +#line 33979 "Photo.c" } else { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33968 "Photo.c" +#line 33983 "Photo.c" } -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old); -#line 33974 "Photo.c" +#line 33989 "Photo.c" } } static void photo_reimport_raw_development_state_impl_dev_to_reimport_class_init (PhotoReimportRawDevelopmentStateImplDevToReimportClass * klass) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateImplDevToReimportClass *) klass)->finalize = photo_reimport_raw_development_state_impl_dev_to_reimport_finalize; -#line 33984 "Photo.c" +#line 33999 "Photo.c" } static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_init (PhotoReimportRawDevelopmentStateImplDevToReimport * self) { BackingPhotoRow* _tmp0_ = NULL; -#line 1383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing_photo_row_new (); -#line 1383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" self->backing = _tmp0_; -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33996 "Photo.c" +#line 34011 "Photo.c" } static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport* obj) { PhotoReimportRawDevelopmentStateImplDevToReimport * self; -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 1383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1385 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing); -#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1386 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 34010 "Photo.c" +#line 34025 "Photo.c" } @@ -34032,58 +34047,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 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 34035 "Photo.c" +#line 34050 "Photo.c" } static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpointer instance) { PhotoReimportRawDevelopmentStateImplDevToReimport* self; self = instance; -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_GET_CLASS (self)->finalize (self); -#line 1382 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1384 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 34048 "Photo.c" +#line 34063 "Photo.c" } } static void photo_reimport_raw_development_state_impl_class_init (PhotoReimportRawDevelopmentStateImplClass * klass) { -#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1383 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_parent_class = g_type_class_peek_parent (klass); -#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1383 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_impl_finalize; -#line 34058 "Photo.c" +#line 34073 "Photo.c" } static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimportRawDevelopmentStateImpl * self) { GeeArrayList* _tmp0_ = NULL; -#line 1392 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1394 "/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, photo_reimport_raw_development_state_impl_dev_to_reimport_unref, NULL, NULL, NULL); -#line 1392 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1394 "/home/jens/Source/shotwell/src/Photo.vala" self->list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1393 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1395 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 34070 "Photo.c" +#line 34085 "Photo.c" } static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState* obj) { PhotoReimportRawDevelopmentStateImpl * self; -#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1383 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl); -#line 1392 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1394 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->list); -#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" +#line 1383 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_CLASS (photo_reimport_raw_development_state_impl_parent_class)->finalize (obj); -#line 34082 "Photo.c" +#line 34097 "Photo.c" } @@ -34226,7 +34241,7 @@ static void photo_class_init (PhotoClass * klass) { 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 34225 "Photo.c" +#line 34240 "Photo.c" } @@ -34237,7 +34252,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 34236 "Photo.c" +#line 34251 "Photo.c" } @@ -34280,7 +34295,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 34279 "Photo.c" +#line 34294 "Photo.c" } @@ -34320,7 +34335,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 34319 "Photo.c" +#line 34334 "Photo.c" } @@ -34343,13 +34358,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 34342 "Photo.c" +#line 34357 "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 34348 "Photo.c" +#line 34363 "Photo.c" } } @@ -34359,13 +34374,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 34358 "Photo.c" +#line 34373 "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 34364 "Photo.c" +#line 34379 "Photo.c" } } @@ -34385,71 +34400,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 4462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4464 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34386 "Photo.c" +#line 34401 "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 4462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4464 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34395 "Photo.c" +#line 34410 "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 4466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4468 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34404 "Photo.c" +#line 34419 "Photo.c" } static gint64* _int64_dup (gint64* self) { gint64* dup; -#line 4466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4468 "/home/jens/Source/shotwell/src/Photo.vala" dup = g_new0 (gint64, 1); -#line 4466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4468 "/home/jens/Source/shotwell/src/Photo.vala" memcpy (dup, self, sizeof (gint64)); -#line 4466 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4468 "/home/jens/Source/shotwell/src/Photo.vala" return dup; -#line 34416 "Photo.c" +#line 34431 "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 4468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4470 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34425 "Photo.c" +#line 34440 "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 4488 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4490 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34434 "Photo.c" +#line 34449 "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 4490 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4492 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_trashcan_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed); -#line 34441 "Photo.c" +#line 34456 "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 4491 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4493 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_offline_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed); -#line 34448 "Photo.c" +#line 34463 "Photo.c" } @@ -34459,43 +34474,43 @@ LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType o MediaSourceHoldingTank* _tmp1_ = NULL; MediaSourceHoldingTank* _tmp2_ = NULL; MediaSourceHoldingTank* _tmp3_ = NULL; -#line 4488 "/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 4490 "/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" _tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4490 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4492 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4490 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4492 "/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 4490 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4492 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4491 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4493 "/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 4491 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4493 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 4491 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4493 "/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 4491 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4493 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp3_); -#line 4487 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4489 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 34478 "Photo.c" +#line 34493 "Photo.c" } LibraryPhotoSourceCollection* library_photo_source_collection_new (void) { -#line 4487 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4489 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_source_collection_construct (TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION); -#line 34485 "Photo.c" +#line 34500 "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 4495 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4497 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34494 "Photo.c" +#line 34509 "Photo.c" } @@ -34503,24 +34518,24 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_trash LibraryPhotoSourceCollection * self; MediaSourceHoldingTank* result = NULL; LibraryPhotoSourceHoldingTank* _tmp0_ = NULL; -#line 4494 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4496 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4495 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4497 "/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 4495 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4497 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); -#line 4495 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4497 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34510 "Photo.c" +#line 34525 "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 4499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4501 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34519 "Photo.c" +#line 34534 "Photo.c" } @@ -34528,15 +34543,15 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_offli LibraryPhotoSourceCollection * self; MediaSourceHoldingTank* result = NULL; LibraryPhotoSourceHoldingTank* _tmp0_ = NULL; -#line 4498 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4500 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4501 "/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 4499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4501 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); -#line 4499 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4501 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34535 "Photo.c" +#line 34550 "Photo.c" } @@ -34546,23 +34561,23 @@ static MediaMonitor* library_photo_source_collection_real_create_media_monitor ( Workers* _tmp0_ = NULL; GCancellable* _tmp1_ = NULL; PhotoMonitor* _tmp2_ = NULL; -#line 4502 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4504 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4502 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4504 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_WORKERS (workers), NULL); -#line 4502 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4504 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); -#line 4503 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4505 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = workers; -#line 4503 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4505 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = cancellable; -#line 4503 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4505 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_monitor_new (_tmp0_, _tmp1_); -#line 4503 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4505 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_MONITOR, MediaMonitor); -#line 4503 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4505 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34561 "Photo.c" +#line 34576 "Photo.c" } @@ -34570,17 +34585,17 @@ static gboolean library_photo_source_collection_real_holds_type_of_source (Sourc LibraryPhotoSourceCollection * self; gboolean result = FALSE; DataSource* _tmp0_ = NULL; -#line 4506 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4508 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4506 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4508 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); -#line 4507 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4509 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = source; -#line 4507 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4509 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO); -#line 4507 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4509 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34579 "Photo.c" +#line 34594 "Photo.c" } @@ -34588,15 +34603,15 @@ static gchar* library_photo_source_collection_real_get_typename (MediaSourceColl LibraryPhotoSourceCollection * self; gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 4510 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4512 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4511 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4513 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = g_strdup (PHOTO_TYPENAME); -#line 4511 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4513 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 4511 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4513 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34595 "Photo.c" +#line 34610 "Photo.c" } @@ -34605,33 +34620,33 @@ static gboolean library_photo_source_collection_real_is_file_recognized (MediaSo gboolean result = FALSE; GFile* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 4514 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4516 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4514 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4516 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 4515 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4517 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file; -#line 4515 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4517 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_file_format_is_file_supported (_tmp0_); -#line 4515 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4517 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 4515 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4517 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34616 "Photo.c" +#line 34631 "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 4527 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4529 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_editable_replaced ((LibraryPhotoSourceCollection*) self, _sender, old_file, new_file); -#line 34623 "Photo.c" +#line 34638 "Photo.c" } static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) { -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4535 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_raw_development_modified ((LibraryPhotoSourceCollection*) self, _sender); -#line 34630 "Photo.c" +#line 34645 "Photo.c" } @@ -34641,30 +34656,30 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo GeeIterable* _tmp75_ = NULL; GeeIterable* _tmp153_ = NULL; GeeIterable* _tmp154_ = NULL; -#line 4518 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4520 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4518 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4520 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added)); -#line 4518 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 4520 "/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" _tmp0_ = added; -#line 4520 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4522 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 34650 "Photo.c" +#line 34665 "Photo.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp1_ = NULL; GeeIterator* _tmp2_ = NULL; -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = added; -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_iterable_iterator (_tmp1_); -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _object_it = _tmp2_; -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 34663 "Photo.c" +#line 34678 "Photo.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; DataObject* object = NULL; @@ -34706,80 +34721,80 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo LibraryPhoto* _tmp56_ = NULL; GeeCollection* _tmp57_ = NULL; GeeCollection* _tmp58_ = NULL; -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _object_it; -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp4_) { -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34713 "Photo.c" +#line 34728 "Photo.c" } -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _object_it; -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" object = (DataObject*) _tmp6_; -#line 4522 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = object; -#line 4522 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4522 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp8_; #line 4524 "/home/jens/Source/shotwell/src/Photo.vala" + photo = _tmp8_; +#line 4526 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo; -#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4526 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo)); -#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4526 "/home/jens/Source/shotwell/src/Photo.vala" editable = _tmp10_; -#line 4525 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4527 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = editable; -#line 4525 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4527 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_ != NULL) { -#line 34737 "Photo.c" +#line 34752 "Photo.c" GeeHashMap* _tmp12_ = NULL; GFile* _tmp13_ = NULL; LibraryPhoto* _tmp14_ = NULL; -#line 4526 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4528 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->by_editable_file; -#line 4526 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4528 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = editable; -#line 4526 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4528 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo; -#line 4526 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4528 "/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 34749 "Photo.c" +#line 34764 "Photo.c" } -#line 4527 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4529 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo; -#line 4527 "/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 4529 "/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" _tmp16_ = photo; -#line 4529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo)); -#line 4529 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" raw_list = _tmp17_; -#line 4530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4532 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = raw_list; -#line 4530 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4532 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp18_ != NULL) { -#line 34765 "Photo.c" +#line 34780 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp19_ = NULL; GeeIterator* _tmp20_ = NULL; -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = raw_list; -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp20_; -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 34778 "Photo.c" +#line 34793 "Photo.c" GeeIterator* _tmp21_ = NULL; gboolean _tmp22_ = FALSE; GFile* f = NULL; @@ -34788,163 +34803,163 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo GeeHashMap* _tmp25_ = NULL; GFile* _tmp26_ = NULL; LibraryPhoto* _tmp27_ = NULL; -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _f_it; -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = gee_iterator_next (_tmp21_); -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp22_) { -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34795 "Photo.c" +#line 34810 "Photo.c" } -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = _f_it; -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = gee_iterator_get (_tmp23_); -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp24_; -#line 4532 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4534 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = self->priv->by_raw_development_file; -#line 4532 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4534 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = f; -#line 4532 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4534 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = photo; -#line 4532 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4534 "/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 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 34813 "Photo.c" +#line 34828 "Photo.c" } -#line 4531 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 34817 "Photo.c" +#line 34832 "Photo.c" } } -#line 4533 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4535 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = photo; -#line 4533 "/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 4535 "/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" _tmp29_ = photo; -#line 4535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_PHOTO, Photo)); -#line 4535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_; -#line 4535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _tmp31_->filesize; -#line 4535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_; -#line 4535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp31_); -#line 4535 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" master_filesize = _tmp33_; -#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo; -#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo)); -#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_; -#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp37_ != NULL; -#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp37_); -#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp38_) { -#line 34850 "Photo.c" +#line 34865 "Photo.c" LibraryPhoto* _tmp39_ = NULL; BackingPhotoRow* _tmp40_ = NULL; BackingPhotoRow* _tmp41_ = NULL; gint64 _tmp42_ = 0LL; -#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = photo; -#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo)); -#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = _tmp40_; -#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_->filesize; -#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = _tmp42_; -#line 4537 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp41_); -#line 34867 "Photo.c" +#line 34882 "Photo.c" } else { -#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4540 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = (gint64) -1; -#line 34871 "Photo.c" +#line 34886 "Photo.c" } -#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4538 "/home/jens/Source/shotwell/src/Photo.vala" editable_filesize = _tmp34_; -#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4541 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = self->priv->filesize_to_photo; -#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4541 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = master_filesize; -#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4541 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = photo; -#line 4539 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4541 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp43_, &_tmp44_, _tmp45_); -#line 4540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = self->priv->photo_to_master_filesize; -#line 4540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = photo; -#line 4540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = master_filesize; -#line 4540 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4542 "/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 4541 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4543 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = editable_filesize; -#line 4541 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4543 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_ >= ((gint64) 0)) { -#line 34895 "Photo.c" +#line 34910 "Photo.c" GeeMultiMap* _tmp50_ = NULL; gint64 _tmp51_ = 0LL; LibraryPhoto* _tmp52_ = NULL; GeeHashMap* _tmp53_ = NULL; LibraryPhoto* _tmp54_ = NULL; gint64 _tmp55_ = 0LL; -#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4544 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = self->priv->filesize_to_photo; -#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4544 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = editable_filesize; -#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4544 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = photo; -#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4544 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp50_, &_tmp51_, _tmp52_); -#line 4543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4545 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = self->priv->photo_to_editable_filesize; -#line 4543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4545 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = photo; -#line 4543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4545 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = editable_filesize; -#line 4543 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4545 "/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 34918 "Photo.c" +#line 34933 "Photo.c" } -#line 4546 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = photo; -#line 4546 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PHOTO, Photo)); -#line 4546 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" raw_rows = _tmp57_; -#line 4547 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4549 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = raw_rows; -#line 4547 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4549 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp58_ != NULL) { -#line 34930 "Photo.c" +#line 34945 "Photo.c" { GeeIterator* _row_it = NULL; GeeCollection* _tmp59_ = NULL; GeeIterator* _tmp60_ = NULL; -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = raw_rows; -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _row_it = _tmp60_; -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 34943 "Photo.c" +#line 34958 "Photo.c" GeeIterator* _tmp61_ = NULL; gboolean _tmp62_ = FALSE; BackingPhotoRow* row = NULL; @@ -34952,29 +34967,29 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo gpointer _tmp64_ = NULL; BackingPhotoRow* _tmp65_ = NULL; gint64 _tmp66_ = 0LL; -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _row_it; -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = gee_iterator_next (_tmp61_); -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp62_) { -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34959 "Photo.c" +#line 34974 "Photo.c" } -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = _row_it; -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = gee_iterator_get (_tmp63_); -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" row = (BackingPhotoRow*) _tmp64_; -#line 4549 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4551 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = row; -#line 4549 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4551 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = _tmp65_->filesize; -#line 4549 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4551 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp66_ >= ((gint64) 0)) { -#line 34973 "Photo.c" +#line 34988 "Photo.c" GeeMultiMap* _tmp67_ = NULL; BackingPhotoRow* _tmp68_ = NULL; gint64 _tmp69_ = 0LL; @@ -34983,72 +34998,72 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo LibraryPhoto* _tmp72_ = NULL; BackingPhotoRow* _tmp73_ = NULL; gint64 _tmp74_ = 0LL; -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = self->priv->filesize_to_photo; -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = row; -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = _tmp68_->filesize; -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = photo; -#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp67_, &_tmp69_, _tmp70_); -#line 4551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = self->priv->photo_to_raw_development_filesize; -#line 4551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = photo; -#line 4551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = row; -#line 4551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = _tmp73_->filesize; -#line 4551 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4553 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp71_, _tmp72_, &_tmp74_); -#line 35002 "Photo.c" +#line 35017 "Photo.c" } -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35006 "Photo.c" +#line 35021 "Photo.c" } -#line 4548 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4550 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35010 "Photo.c" +#line 35025 "Photo.c" } } -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_rows); -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_list); -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable); -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 35023 "Photo.c" +#line 35038 "Photo.c" } -#line 4521 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4523 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 35027 "Photo.c" +#line 35042 "Photo.c" } } -#line 4558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4560 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = removed; -#line 4558 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4560 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp75_ != NULL) { -#line 35034 "Photo.c" +#line 35049 "Photo.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp76_ = NULL; GeeIterator* _tmp77_ = NULL; -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = removed; -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = gee_iterable_iterator (_tmp76_); -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _object_it = _tmp77_; -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35047 "Photo.c" +#line 35062 "Photo.c" GeeIterator* _tmp78_ = NULL; gboolean _tmp79_ = FALSE; DataObject* object = NULL; @@ -35091,39 +35106,39 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo LibraryPhoto* _tmp134_ = NULL; GeeCollection* _tmp135_ = NULL; GeeCollection* _tmp136_ = NULL; -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = _object_it; -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = gee_iterator_next (_tmp78_); -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp79_) { -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35098 "Photo.c" +#line 35113 "Photo.c" } -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = _object_it; -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = gee_iterator_get (_tmp80_); -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" object = (DataObject*) _tmp81_; -#line 4560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4562 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = object; -#line 4560 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4562 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4560 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp83_; #line 4562 "/home/jens/Source/shotwell/src/Photo.vala" + photo = _tmp83_; +#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" _tmp84_ = photo; -#line 4562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_PHOTO, Photo)); -#line 4562 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" editable = _tmp85_; -#line 4563 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4565 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = editable; -#line 4563 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4565 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp86_ != NULL) { -#line 35122 "Photo.c" +#line 35137 "Photo.c" gboolean is_removed = FALSE; GeeHashMap* _tmp87_ = NULL; LibraryPhoto* _tmp88_ = NULL; @@ -35132,58 +35147,58 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo gboolean _tmp91_ = FALSE; gboolean _tmp92_ = FALSE; gboolean _tmp93_ = FALSE; -#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = self->priv->by_editable_file; -#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = photo; -#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_PHOTO, Photo)); -#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tmp89_; -#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4566 "/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 4564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = _tmp91_; -#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp90_); -#line 4564 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4566 "/home/jens/Source/shotwell/src/Photo.vala" is_removed = _tmp92_; -#line 4565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4567 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = is_removed; -#line 4565 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4567 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp93_, "is_removed"); -#line 35151 "Photo.c" +#line 35166 "Photo.c" } -#line 4567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = photo; -#line 4567 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp95_, NULL, FALSE); -#line 4567 "/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 4569 "/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" _tmp96_ = photo; -#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_PHOTO, Photo)); -#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" raw_list = _tmp97_; -#line 4570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp98_ = raw_list; -#line 4570 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4572 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp98_ != NULL) { -#line 35169 "Photo.c" +#line 35184 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp99_ = NULL; GeeIterator* _tmp100_ = NULL; -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" _tmp99_ = raw_list; -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" _tmp100_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp100_; -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35182 "Photo.c" +#line 35197 "Photo.c" GeeIterator* _tmp101_ = NULL; gboolean _tmp102_ = FALSE; GFile* f = NULL; @@ -35191,158 +35206,158 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo gpointer _tmp104_ = NULL; GeeHashMap* _tmp105_ = NULL; GFile* _tmp106_ = NULL; -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" _tmp101_ = _f_it; -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" _tmp102_ = gee_iterator_next (_tmp101_); -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp102_) { -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35198 "Photo.c" +#line 35213 "Photo.c" } -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" _tmp103_ = _f_it; -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" _tmp104_ = gee_iterator_get (_tmp103_); -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp104_; -#line 4572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp105_ = self->priv->by_raw_development_file; -#line 4572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp106_ = f; -#line 4572 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4574 "/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 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 35214 "Photo.c" +#line 35229 "Photo.c" } -#line 4571 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 35218 "Photo.c" +#line 35233 "Photo.c" } } -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4575 "/home/jens/Source/shotwell/src/Photo.vala" _tmp107_ = photo; -#line 4573 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4575 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp108_, NULL, FALSE); -#line 4573 "/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 4575 "/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" _tmp109_ = photo; -#line 4575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" _tmp110_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_PHOTO, Photo)); -#line 4575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" _tmp111_ = _tmp110_; -#line 4575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" _tmp112_ = _tmp111_->filesize; -#line 4575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" _tmp113_ = _tmp112_; -#line 4575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp111_); -#line 4575 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" master_filesize = _tmp113_; -#line 4576 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" _tmp115_ = photo; -#line 4576 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" _tmp116_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, TYPE_PHOTO, Photo)); -#line 4576 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" _tmp117_ = _tmp116_; -#line 4576 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" _tmp118_ = _tmp117_ != NULL; -#line 4576 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp117_); -#line 4576 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp118_) { -#line 35253 "Photo.c" +#line 35268 "Photo.c" LibraryPhoto* _tmp119_ = NULL; BackingPhotoRow* _tmp120_ = NULL; BackingPhotoRow* _tmp121_ = NULL; gint64 _tmp122_ = 0LL; -#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" _tmp119_ = photo; -#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" _tmp120_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_PHOTO, Photo)); -#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" _tmp121_ = _tmp120_; -#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" _tmp122_ = _tmp121_->filesize; -#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_ = _tmp122_; -#line 4577 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp121_); -#line 35270 "Photo.c" +#line 35285 "Photo.c" } else { -#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp114_ = (gint64) -1; -#line 35274 "Photo.c" +#line 35289 "Photo.c" } -#line 4576 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4578 "/home/jens/Source/shotwell/src/Photo.vala" editable_filesize = _tmp114_; -#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp123_ = self->priv->filesize_to_photo; -#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp124_ = master_filesize; -#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp125_ = photo; -#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4581 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp123_, &_tmp124_, _tmp125_); -#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4582 "/home/jens/Source/shotwell/src/Photo.vala" _tmp126_ = self->priv->photo_to_master_filesize; -#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4582 "/home/jens/Source/shotwell/src/Photo.vala" _tmp127_ = photo; -#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4582 "/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 4581 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4583 "/home/jens/Source/shotwell/src/Photo.vala" _tmp128_ = editable_filesize; -#line 4581 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4583 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp128_ >= ((gint64) 0)) { -#line 35296 "Photo.c" +#line 35311 "Photo.c" GeeMultiMap* _tmp129_ = NULL; gint64 _tmp130_ = 0LL; LibraryPhoto* _tmp131_ = NULL; GeeHashMap* _tmp132_ = NULL; LibraryPhoto* _tmp133_ = NULL; -#line 4582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4584 "/home/jens/Source/shotwell/src/Photo.vala" _tmp129_ = self->priv->filesize_to_photo; -#line 4582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4584 "/home/jens/Source/shotwell/src/Photo.vala" _tmp130_ = editable_filesize; -#line 4582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4584 "/home/jens/Source/shotwell/src/Photo.vala" _tmp131_ = photo; -#line 4582 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4584 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp129_, &_tmp130_, _tmp131_); -#line 4583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp132_ = self->priv->photo_to_editable_filesize; -#line 4583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp133_ = photo; -#line 4583 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4585 "/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 35316 "Photo.c" +#line 35331 "Photo.c" } -#line 4586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp134_ = photo; -#line 4586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" _tmp135_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, TYPE_PHOTO, Photo)); -#line 4586 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" raw_rows = _tmp135_; -#line 4587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4589 "/home/jens/Source/shotwell/src/Photo.vala" _tmp136_ = raw_rows; -#line 4587 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4589 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp136_ != NULL) { -#line 35328 "Photo.c" +#line 35343 "Photo.c" { GeeIterator* _row_it = NULL; GeeCollection* _tmp137_ = NULL; GeeIterator* _tmp138_ = NULL; -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp137_ = raw_rows; -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp138_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _row_it = _tmp138_; -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35341 "Photo.c" +#line 35356 "Photo.c" GeeIterator* _tmp139_ = NULL; gboolean _tmp140_ = FALSE; BackingPhotoRow* row = NULL; @@ -35350,29 +35365,29 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo gpointer _tmp142_ = NULL; BackingPhotoRow* _tmp143_ = NULL; gint64 _tmp144_ = 0LL; -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp139_ = _row_it; -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp140_ = gee_iterator_next (_tmp139_); -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp140_) { -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35357 "Photo.c" +#line 35372 "Photo.c" } -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp141_ = _row_it; -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp142_ = gee_iterator_get (_tmp141_); -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" row = (BackingPhotoRow*) _tmp142_; -#line 4589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp143_ = row; -#line 4589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4591 "/home/jens/Source/shotwell/src/Photo.vala" _tmp144_ = _tmp143_->filesize; -#line 4589 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4591 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp144_ >= ((gint64) 0)) { -#line 35371 "Photo.c" +#line 35386 "Photo.c" GeeMultiMap* _tmp145_ = NULL; BackingPhotoRow* _tmp146_ = NULL; gint64 _tmp147_ = 0LL; @@ -35381,116 +35396,116 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo LibraryPhoto* _tmp150_ = NULL; BackingPhotoRow* _tmp151_ = NULL; gint64 _tmp152_ = 0LL; -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _tmp145_ = self->priv->filesize_to_photo; -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _tmp146_ = row; -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _tmp147_ = _tmp146_->filesize; -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _tmp148_ = photo; -#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp145_, &_tmp147_, _tmp148_); -#line 4591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp149_ = self->priv->photo_to_raw_development_filesize; -#line 4591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp150_ = photo; -#line 4591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp151_ = row; -#line 4591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4593 "/home/jens/Source/shotwell/src/Photo.vala" _tmp152_ = _tmp151_->filesize; -#line 4591 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4593 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp149_, _tmp150_, &_tmp152_); -#line 35400 "Photo.c" +#line 35415 "Photo.c" } -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35404 "Photo.c" +#line 35419 "Photo.c" } -#line 4588 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4590 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35408 "Photo.c" +#line 35423 "Photo.c" } } -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_rows); -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_list); -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable); -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 35421 "Photo.c" +#line 35436 "Photo.c" } -#line 4559 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4561 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 35425 "Photo.c" +#line 35440 "Photo.c" } } -#line 4598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4600 "/home/jens/Source/shotwell/src/Photo.vala" _tmp153_ = added; -#line 4598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4600 "/home/jens/Source/shotwell/src/Photo.vala" _tmp154_ = removed; -#line 4598 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4600 "/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 35434 "Photo.c" +#line 35449 "Photo.c" } static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, Photo* photo, GFile* old_file, GFile* new_file) { GFile* _tmp0_ = NULL; GFile* _tmp5_ = NULL; -#line 4601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (photo)); -#line 4601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file)); -#line 4601 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file)); -#line 4602 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4604 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = old_file; -#line 4602 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4604 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 35453 "Photo.c" +#line 35468 "Photo.c" gboolean is_removed = FALSE; GeeHashMap* _tmp1_ = NULL; GFile* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; -#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->by_editable_file; -#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4605 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = old_file; -#line 4603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4605 "/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 4603 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4605 "/home/jens/Source/shotwell/src/Photo.vala" is_removed = _tmp3_; -#line 4604 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4606 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = is_removed; -#line 4604 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4606 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp4_, "is_removed"); -#line 35471 "Photo.c" +#line 35486 "Photo.c" } -#line 4607 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = new_file; -#line 4607 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ != NULL) { -#line 35477 "Photo.c" +#line 35492 "Photo.c" GeeHashMap* _tmp6_ = NULL; GFile* _tmp7_ = NULL; Photo* _tmp8_ = NULL; -#line 4608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->by_editable_file; -#line 4608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = new_file; -#line 4608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4610 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo; -#line 4608 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4610 "/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 35489 "Photo.c" +#line 35504 "Photo.c" } } @@ -35511,35 +35526,35 @@ static void library_photo_source_collection_on_raw_development_modified (Library LibraryPhoto* _tmp35_ = NULL; GeeCollection* _tmp36_ = NULL; GeeCollection* _tmp37_ = NULL; -#line 4611 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4613 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4611 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4613 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (_photo)); -#line 4612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4614 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _photo; -#line 4612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4614 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL); -#line 4612 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4614 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp1_; -#line 4613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4615 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo; -#line 4613 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4615 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 4614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4616 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4614 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4616 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 35528 "Photo.c" +#line 35543 "Photo.c" } -#line 4617 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->photo_to_raw_development_filesize; -#line 4617 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo; -#line 4617 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_); -#line 4617 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 35538 "Photo.c" +#line 35553 "Photo.c" GeeMultiMap* _tmp21_ = NULL; LibraryPhoto* _tmp22_ = NULL; { @@ -35550,25 +35565,25 @@ static void library_photo_source_collection_on_raw_development_modified (Library GeeCollection* _tmp9_ = NULL; GeeIterator* _tmp10_ = NULL; GeeIterator* _tmp11_ = NULL; -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->photo_to_raw_development_filesize; -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo; -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_); -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp9_); -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _s_it = _tmp11_; -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35567 "Photo.c" +#line 35582 "Photo.c" GeeIterator* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; gint64 s = 0LL; @@ -35579,74 +35594,74 @@ static void library_photo_source_collection_on_raw_development_modified (Library GeeMultiMap* _tmp18_ = NULL; gint64 _tmp19_ = 0LL; LibraryPhoto* _tmp20_ = NULL; -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _s_it; -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = gee_iterator_next (_tmp12_); -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp13_) { -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35586 "Photo.c" +#line 35601 "Photo.c" } -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _s_it; -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = gee_iterator_get (_tmp14_); -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = (gint64*) _tmp15_; -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = *_tmp16_; -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp16_); -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" s = _tmp17_; -#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4621 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->priv->filesize_to_photo; -#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4621 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = s; -#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4621 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo; -#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4621 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp18_, &_tmp19_, _tmp20_); -#line 35608 "Photo.c" +#line 35623 "Photo.c" } -#line 4618 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_s_it); -#line 35612 "Photo.c" +#line 35627 "Photo.c" } -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4622 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = self->priv->photo_to_raw_development_filesize; -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4622 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = photo; -#line 4620 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4622 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove_all (_tmp21_, _tmp22_); -#line 35620 "Photo.c" +#line 35635 "Photo.c" } -#line 4624 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo; -#line 4624 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo)); -#line 4624 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" raw_list = _tmp24_; -#line 4625 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4627 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = raw_list; -#line 4625 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4627 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp25_ != NULL) { -#line 35632 "Photo.c" +#line 35647 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp26_ = NULL; GeeIterator* _tmp27_ = NULL; -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = raw_list; -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp27_; -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35645 "Photo.c" +#line 35660 "Photo.c" GeeIterator* _tmp28_ = NULL; gboolean _tmp29_ = FALSE; GFile* f = NULL; @@ -35655,63 +35670,63 @@ static void library_photo_source_collection_on_raw_development_modified (Library GeeHashMap* _tmp32_ = NULL; GFile* _tmp33_ = NULL; LibraryPhoto* _tmp34_ = NULL; -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _f_it; -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = gee_iterator_next (_tmp28_); -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp29_) { -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35662 "Photo.c" +#line 35677 "Photo.c" } -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _f_it; -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = gee_iterator_get (_tmp30_); -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp31_; -#line 4627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = self->priv->by_raw_development_file; -#line 4627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = f; -#line 4627 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = photo; -#line 4627 "/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 (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_); -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 35680 "Photo.c" +#line 35695 "Photo.c" } -#line 4626 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 35684 "Photo.c" +#line 35699 "Photo.c" } } -#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo; -#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo)); -#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" raw_rows = _tmp36_; -#line 4630 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4632 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = raw_rows; -#line 4630 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4632 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp37_ != NULL) { -#line 35697 "Photo.c" +#line 35712 "Photo.c" { GeeIterator* _row_it = NULL; GeeCollection* _tmp38_ = NULL; GeeIterator* _tmp39_ = NULL; -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = raw_rows; -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _row_it = _tmp39_; -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35710 "Photo.c" +#line 35725 "Photo.c" GeeIterator* _tmp40_ = NULL; gboolean _tmp41_ = FALSE; BackingPhotoRow* row = NULL; @@ -35719,29 +35734,29 @@ static void library_photo_source_collection_on_raw_development_modified (Library gpointer _tmp43_ = NULL; BackingPhotoRow* _tmp44_ = NULL; gint64 _tmp45_ = 0LL; -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = _row_it; -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = gee_iterator_next (_tmp40_); -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp41_) { -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35726 "Photo.c" +#line 35741 "Photo.c" } -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _row_it; -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = gee_iterator_get (_tmp42_); -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" row = (BackingPhotoRow*) _tmp43_; -#line 4632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = row; -#line 4632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4634 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp44_->filesize; -#line 4632 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4634 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp45_ > ((gint64) 0)) { -#line 35740 "Photo.c" +#line 35755 "Photo.c" GeeMultiMap* _tmp46_ = NULL; BackingPhotoRow* _tmp47_ = NULL; gint64 _tmp48_ = 0LL; @@ -35750,62 +35765,62 @@ static void library_photo_source_collection_on_raw_development_modified (Library LibraryPhoto* _tmp51_ = NULL; BackingPhotoRow* _tmp52_ = NULL; gint64 _tmp53_ = 0LL; -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = self->priv->filesize_to_photo; -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = row; -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_->filesize; -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = photo; -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4635 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp46_, &_tmp48_, _tmp49_); -#line 4634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4636 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = self->priv->photo_to_raw_development_filesize; -#line 4634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4636 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = photo; -#line 4634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4636 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = row; -#line 4634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4636 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp52_->filesize; -#line 4634 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4636 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp50_, _tmp51_, &_tmp53_); -#line 35769 "Photo.c" +#line 35784 "Photo.c" } -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35773 "Photo.c" +#line 35788 "Photo.c" } -#line 4631 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35777 "Photo.c" +#line 35792 "Photo.c" } } -#line 4611 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4613 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_rows); -#line 4611 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4613 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_list); -#line 4611 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4613 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 35786 "Photo.c" +#line 35801 "Photo.c" } static gpointer __int64_dup0 (gpointer self) { -#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" return self ? _int64_dup (self) : NULL; -#line 35793 "Photo.c" +#line 35808 "Photo.c" } static void library_photo_source_collection_real_items_altered (DataCollection* base, GeeMap* items) { LibraryPhotoSourceCollection * self; GeeMap* _tmp72_ = NULL; -#line 4640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4642 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4640 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4642 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_MAP (items)); -#line 35804 "Photo.c" +#line 35819 "Photo.c" { GeeIterator* _object_it = NULL; GeeMap* _tmp0_ = NULL; @@ -35814,25 +35829,25 @@ static void library_photo_source_collection_real_items_altered (DataCollection* GeeSet* _tmp3_ = NULL; GeeIterator* _tmp4_ = NULL; GeeIterator* _tmp5_ = NULL; -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = items; -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_map_get_keys (_tmp0_); -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _object_it = _tmp5_; -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35831 "Photo.c" +#line 35846 "Photo.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; DataObject* object = NULL; @@ -35848,59 +35863,59 @@ static void library_photo_source_collection_real_items_altered (DataCollection* gboolean _tmp15_ = FALSE; Alteration* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _object_it; -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp7_) { -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35855 "Photo.c" +#line 35870 "Photo.c" } -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _object_it; -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" object = (DataObject*) _tmp9_; -#line 4642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4644 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = items; -#line 4642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4644 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = object; -#line 4642 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4644 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = gee_map_get (_tmp10_, _tmp11_); -#line 4642 "/home/jens/Source/shotwell/src/Photo.vala" - alteration = (Alteration*) _tmp12_; #line 4644 "/home/jens/Source/shotwell/src/Photo.vala" + alteration = (Alteration*) _tmp12_; +#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = object; -#line 4644 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4644 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp14_; #line 4646 "/home/jens/Source/shotwell/src/Photo.vala" + photo = _tmp14_; +#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = alteration; -#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = alteration_has_detail (_tmp16_, "image", "master"); -#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_) { -#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = TRUE; -#line 35885 "Photo.c" +#line 35900 "Photo.c" } else { Alteration* _tmp18_ = NULL; gboolean _tmp19_ = FALSE; -#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = alteration; -#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = alteration_has_detail (_tmp18_, "image", "editable"); -#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp19_; -#line 35895 "Photo.c" +#line 35910 "Photo.c" } -#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 35899 "Photo.c" +#line 35914 "Photo.c" gint64 old_master_filesize = 0LL; GeeHashMap* _tmp20_ = NULL; LibraryPhoto* _tmp21_ = NULL; @@ -35937,215 +35952,215 @@ static void library_photo_source_collection_real_items_altered (DataCollection* gint64 _tmp63_ = 0LL; LibraryPhoto* _tmp64_ = NULL; gint64 _tmp65_ = 0LL; -#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = self->priv->photo_to_master_filesize; -#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo; -#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4649 "/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 4647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = (gint64*) _tmp22_; -#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = *_tmp23_; -#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp23_); -#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" old_master_filesize = _tmp24_; -#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = self->priv->photo_to_editable_filesize; -#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = photo; -#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4650 "/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 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_) { -#line 35958 "Photo.c" +#line 35973 "Photo.c" GeeHashMap* _tmp29_ = NULL; LibraryPhoto* _tmp30_ = NULL; gpointer _tmp31_ = NULL; -#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4651 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = self->priv->photo_to_editable_filesize; -#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4651 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = photo; -#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4651 "/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 4649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4651 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp25_); -#line 4649 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4651 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = (gint64*) _tmp31_; -#line 35972 "Photo.c" +#line 35987 "Photo.c" } else { gint64 _tmp32_ = 0LL; gint64* _tmp33_ = NULL; -#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = (gint64) -1; -#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = __int64_dup0 (&_tmp32_); -#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp25_); -#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp33_; -#line 35984 "Photo.c" +#line 35999 "Photo.c" } -#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4650 "/home/jens/Source/shotwell/src/Photo.vala" old_editable_filesize = *_tmp25_; -#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4654 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = self->priv->photo_to_master_filesize; -#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4654 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo; -#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4654 "/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 4653 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = self->priv->filesize_to_photo; -#line 4653 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = old_master_filesize; -#line 4653 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = photo; -#line 4653 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp36_, &_tmp37_, _tmp38_); -#line 4654 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4656 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = old_editable_filesize; -#line 4654 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4656 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp39_ >= ((gint64) 0)) { -#line 36006 "Photo.c" +#line 36021 "Photo.c" GeeHashMap* _tmp40_ = NULL; LibraryPhoto* _tmp41_ = NULL; GeeMultiMap* _tmp42_ = NULL; gint64 _tmp43_ = 0LL; LibraryPhoto* _tmp44_ = NULL; -#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4657 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = self->priv->photo_to_editable_filesize; -#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4657 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = photo; -#line 4655 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4657 "/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 4656 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4658 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = self->priv->filesize_to_photo; -#line 4656 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4658 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = old_editable_filesize; -#line 4656 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4658 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = photo; -#line 4656 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4658 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp42_, &_tmp43_, _tmp44_); -#line 36026 "Photo.c" +#line 36041 "Photo.c" } -#line 4659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = photo; -#line 4659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo)); -#line 4659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _tmp46_; -#line 4659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_->filesize; -#line 4659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = _tmp48_; -#line 4659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp47_); -#line 4659 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" master_filesize = _tmp49_; -#line 4660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = photo; -#line 4660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_PHOTO, Photo)); -#line 4660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp52_; -#line 4660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = _tmp53_ != NULL; -#line 4660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp53_); -#line 4660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp54_) { -#line 36054 "Photo.c" +#line 36069 "Photo.c" LibraryPhoto* _tmp55_ = NULL; BackingPhotoRow* _tmp56_ = NULL; BackingPhotoRow* _tmp57_ = NULL; gint64 _tmp58_ = 0LL; -#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = photo; -#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo)); -#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = _tmp56_; -#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = _tmp57_->filesize; -#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = _tmp58_; -#line 4661 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp57_); -#line 36071 "Photo.c" +#line 36086 "Photo.c" } else { -#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4664 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = (gint64) -1; -#line 36075 "Photo.c" +#line 36090 "Photo.c" } -#line 4660 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" editable_filesize = _tmp50_; -#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4665 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = self->priv->photo_to_master_filesize; -#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4665 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = photo; -#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4665 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = master_filesize; -#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4665 "/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 4664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4666 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = self->priv->filesize_to_photo; -#line 4664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4666 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = master_filesize; -#line 4664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4666 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = photo; -#line 4664 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4666 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp62_, &_tmp63_, _tmp64_); -#line 4665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = editable_filesize; -#line 4665 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp65_ >= ((gint64) 0)) { -#line 36099 "Photo.c" +#line 36114 "Photo.c" GeeHashMap* _tmp66_ = NULL; LibraryPhoto* _tmp67_ = NULL; gint64 _tmp68_ = 0LL; GeeMultiMap* _tmp69_ = NULL; gint64 _tmp70_ = 0LL; LibraryPhoto* _tmp71_ = NULL; -#line 4666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = self->priv->photo_to_editable_filesize; -#line 4666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = photo; -#line 4666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = editable_filesize; -#line 4666 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4668 "/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 4667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = self->priv->filesize_to_photo; -#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = editable_filesize; -#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = photo; -#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp69_, &_tmp70_, _tmp71_); -#line 36122 "Photo.c" +#line 36137 "Photo.c" } -#line 4646 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4648 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp25_); -#line 36126 "Photo.c" +#line 36141 "Photo.c" } -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (alteration); -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 36134 "Photo.c" +#line 36149 "Photo.c" } -#line 4641 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4643 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 36138 "Photo.c" +#line 36153 "Photo.c" } -#line 4672 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4674 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = items; -#line 4672 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4674 "/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 36144 "Photo.c" +#line 36159 "Photo.c" } @@ -36154,28 +36169,28 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med GeeHashMultiMap* map = NULL; GeeHashMultiMap* _tmp0_ = NULL; GeeCollection* _tmp97_ = NULL; -#line 4676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (media_sources)); -#line 4677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4679 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 4677 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4679 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 36161 "Photo.c" +#line 36176 "Photo.c" { GeeIterator* _media_it = NULL; GeeCollection* _tmp1_ = NULL; GeeIterator* _tmp2_ = NULL; -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_sources; -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _media_it = _tmp2_; -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36174 "Photo.c" +#line 36189 "Photo.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; MediaSource* media = NULL; @@ -36198,80 +36213,80 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med gboolean _tmp21_ = FALSE; PhotoMetadata* _tmp55_ = NULL; gboolean _tmp56_ = FALSE; -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _media_it; -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp4_) { -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36205 "Photo.c" +#line 36220 "Photo.c" } -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _media_it; -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" media = (MediaSource*) _tmp6_; -#line 4679 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4681 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = media; -#line 4679 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4681 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4679 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4681 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp8_; -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4682 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo; -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4682 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource)); -#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4682 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp10_; -#line 4683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4685 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = hierarchical_tag_index_get_global_index (); -#line 4683 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4685 "/home/jens/Source/shotwell/src/Photo.vala" global_index = _tmp11_; -#line 4690 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4692 "/home/jens/Source/shotwell/src/Photo.vala" htag_index = NULL; -#line 4691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4693 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = metadata; -#line 4691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4693 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_metadata_has_hierarchical_keywords (_tmp12_); -#line 4691 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4693 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { -#line 36237 "Photo.c" +#line 36252 "Photo.c" PhotoMetadata* _tmp14_ = NULL; GeeSet* _tmp15_ = NULL; GeeSet* _tmp16_ = NULL; HierarchicalTagIndex* _tmp17_ = NULL; -#line 4692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = metadata; -#line 4692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_metadata_get_hierarchical_keywords (_tmp14_); -#line 4692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4694 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 4692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4694 "/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 4692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4694 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (htag_index); -#line 4692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4694 "/home/jens/Source/shotwell/src/Photo.vala" htag_index = _tmp17_; -#line 4692 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4694 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp16_); -#line 36256 "Photo.c" +#line 36271 "Photo.c" } -#line 4696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = photo; -#line 4696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = library_photo_get_import_keywords (_tmp18_); -#line 4696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 4696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_ != NULL; -#line 4696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp20_); -#line 4696 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { -#line 36270 "Photo.c" +#line 36285 "Photo.c" { GeeIterator* _keyword_it = NULL; LibraryPhoto* _tmp22_ = NULL; @@ -36279,23 +36294,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med GeeCollection* _tmp24_ = NULL; GeeIterator* _tmp25_ = NULL; GeeIterator* _tmp26_ = NULL; -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = photo; -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = library_photo_get_import_keywords (_tmp22_); -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _tmp23_; -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = _tmp25_; -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp24_); -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _keyword_it = _tmp26_; -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36294 "Photo.c" +#line 36309 "Photo.c" GeeIterator* _tmp27_ = NULL; gboolean _tmp28_ = FALSE; gchar* keyword = NULL; @@ -36310,67 +36325,67 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med const gchar* _tmp39_ = NULL; gboolean _tmp40_ = FALSE; const gchar* _tmp49_ = NULL; -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _keyword_it; -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = gee_iterator_next (_tmp27_); -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp28_) { -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36317 "Photo.c" +#line 36332 "Photo.c" } -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _keyword_it; -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = gee_iterator_get (_tmp29_); -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" keyword = (gchar*) _tmp30_; -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = htag_index; -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp32_ != NULL) { -#line 36329 "Photo.c" +#line 36344 "Photo.c" HierarchicalTagIndex* _tmp33_ = NULL; const gchar* _tmp34_ = NULL; gboolean _tmp35_ = FALSE; -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = htag_index; -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = keyword; -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = hierarchical_tag_index_is_tag_in_index (_tmp33_, _tmp34_); -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp35_; -#line 36341 "Photo.c" +#line 36356 "Photo.c" } else { -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = FALSE; -#line 36345 "Photo.c" +#line 36360 "Photo.c" } -#line 4698 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4700 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp31_) { -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4701 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4701 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 36353 "Photo.c" +#line 36368 "Photo.c" } -#line 4701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4703 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = keyword; -#line 4701 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4703 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = tag_prep_tag_name (_tmp36_); -#line 4701 "/home/jens/Source/shotwell/src/Photo.vala" - name = _tmp37_; #line 4703 "/home/jens/Source/shotwell/src/Photo.vala" + name = _tmp37_; +#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = global_index; -#line 4703 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = name; -#line 4703 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = hierarchical_tag_index_is_tag_in_index (_tmp38_, _tmp39_); -#line 4703 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp40_) { -#line 36369 "Photo.c" +#line 36384 "Photo.c" gchar* most_derived_path = NULL; HierarchicalTagIndex* _tmp41_ = NULL; const gchar* _tmp42_ = NULL; @@ -36380,82 +36395,82 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med Tag* _tmp46_ = NULL; Tag* _tmp47_ = NULL; LibraryPhoto* _tmp48_ = NULL; -#line 4704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4706 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = global_index; -#line 4704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4706 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = name; -#line 4704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4706 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = hierarchical_tag_index_get_path_for_name (_tmp41_, _tmp42_); -#line 4704 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4706 "/home/jens/Source/shotwell/src/Photo.vala" most_derived_path = _tmp43_; -#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4707 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = map; -#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4707 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = most_derived_path; -#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4707 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = tag_for_path (_tmp45_); -#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4707 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _tmp46_; -#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4707 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = photo; -#line 4705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4707 "/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 4705 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4707 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp47_); -#line 4706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4708 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (most_derived_path); -#line 4706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4708 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 4706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4708 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 4706 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4708 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 36409 "Photo.c" +#line 36424 "Photo.c" } -#line 4709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4711 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = name; -#line 4709 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4711 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_ != NULL) { -#line 36415 "Photo.c" +#line 36430 "Photo.c" GeeHashMultiMap* _tmp50_ = NULL; const gchar* _tmp51_ = NULL; Tag* _tmp52_ = NULL; Tag* _tmp53_ = NULL; LibraryPhoto* _tmp54_ = NULL; -#line 4710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = map; -#line 4710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = name; -#line 4710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = tag_for_path (_tmp51_); -#line 4710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = _tmp52_; -#line 4710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = photo; -#line 4710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4712 "/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 4710 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp53_); -#line 36435 "Photo.c" +#line 36450 "Photo.c" } -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 36441 "Photo.c" +#line 36456 "Photo.c" } -#line 4697 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_keyword_it); -#line 36445 "Photo.c" +#line 36460 "Photo.c" } } -#line 4714 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4716 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = metadata; -#line 4714 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4716 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = photo_metadata_has_hierarchical_keywords (_tmp55_); -#line 4714 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4716 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp56_) { -#line 36454 "Photo.c" +#line 36469 "Photo.c" { GeeIterator* _path_it = NULL; HierarchicalTagIndex* _tmp57_ = NULL; @@ -36463,23 +36478,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med GeeCollection* _tmp59_ = NULL; GeeIterator* _tmp60_ = NULL; GeeIterator* _tmp61_ = NULL; -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = htag_index; -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = hierarchical_tag_index_get_all_paths (_tmp57_); -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = _tmp58_; -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = _tmp60_; -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp59_); -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _path_it = _tmp61_; -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36478 "Photo.c" +#line 36493 "Photo.c" GeeIterator* _tmp62_ = NULL; gboolean _tmp63_ = FALSE; gchar* path = NULL; @@ -36489,94 +36504,94 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med const gchar* _tmp66_ = NULL; gchar* _tmp67_ = NULL; const gchar* _tmp68_ = NULL; -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = _path_it; -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = gee_iterator_next (_tmp62_); -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp63_) { -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36496 "Photo.c" +#line 36511 "Photo.c" } -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = _path_it; -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = gee_iterator_get (_tmp64_); -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" path = (gchar*) _tmp65_; -#line 4716 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = path; -#line 4716 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = tag_prep_tag_name (_tmp66_); -#line 4716 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" name = _tmp67_; -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = name; -#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp68_ != NULL) { -#line 36514 "Photo.c" +#line 36529 "Photo.c" GeeHashMultiMap* _tmp69_ = NULL; const gchar* _tmp70_ = NULL; Tag* _tmp71_ = NULL; Tag* _tmp72_ = NULL; LibraryPhoto* _tmp73_ = NULL; -#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = map; -#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = name; -#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = tag_for_path (_tmp70_); -#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = _tmp71_; -#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = photo; -#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4720 "/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 4718 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4720 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp72_); -#line 36534 "Photo.c" +#line 36549 "Photo.c" } -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (path); -#line 36540 "Photo.c" +#line 36555 "Photo.c" } -#line 4715 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4717 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_path_it); -#line 36544 "Photo.c" +#line 36559 "Photo.c" } } -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (htag_index); -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (global_index); -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 36557 "Photo.c" +#line 36572 "Photo.c" } -#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4680 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 36561 "Photo.c" +#line 36576 "Photo.c" } { GeeIterator* _media_it = NULL; GeeCollection* _tmp74_ = NULL; GeeIterator* _tmp75_ = NULL; -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = media_sources; -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _media_it = _tmp75_; -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36575 "Photo.c" +#line 36590 "Photo.c" GeeIterator* _tmp76_ = NULL; gboolean _tmp77_ = FALSE; MediaSource* media = NULL; @@ -36586,41 +36601,41 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med MediaSource* _tmp80_ = NULL; LibraryPhoto* _tmp81_ = NULL; LibraryPhoto* _tmp82_ = NULL; -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = _media_it; -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = gee_iterator_next (_tmp76_); -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp77_) { -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36593 "Photo.c" +#line 36608 "Photo.c" } -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp78_ = _media_it; -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = gee_iterator_get (_tmp78_); -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" media = (MediaSource*) _tmp79_; -#line 4724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp80_ = media; -#line 4724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4726 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4724 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4726 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp81_; -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4727 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = photo; -#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4727 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_clear_import_keywords (_tmp82_); -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 36615 "Photo.c" +#line 36630 "Photo.c" } -#line 4723 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4725 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 36619 "Photo.c" +#line 36634 "Photo.c" } { GeeIterator* _tag_it = NULL; @@ -36629,23 +36644,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med GeeSet* _tmp85_ = NULL; GeeIterator* _tmp86_ = NULL; GeeIterator* _tmp87_ = NULL; -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp83_ = map; -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/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 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp85_ = _tmp84_; -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp86_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp87_ = _tmp86_; -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp85_); -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _tag_it = _tmp87_; -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36644 "Photo.c" +#line 36659 "Photo.c" GeeIterator* _tmp88_ = NULL; gboolean _tmp89_ = FALSE; Tag* tag = NULL; @@ -36656,155 +36671,155 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med Tag* _tmp94_ = NULL; GeeCollection* _tmp95_ = NULL; GeeCollection* _tmp96_ = NULL; -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp88_ = _tag_it; -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp89_ = gee_iterator_next (_tmp88_); -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp89_) { -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36663 "Photo.c" +#line 36678 "Photo.c" } -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp90_ = _tag_it; -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _tmp91_ = gee_iterator_get (_tmp90_); -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" tag = (Tag*) _tmp91_; -#line 4729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp92_ = tag; -#line 4729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp93_ = map; -#line 4729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp94_ = tag; -#line 4729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/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 4729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp96_ = _tmp95_; -#line 4729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" tag_attach_many (_tmp92_, _tmp96_); -#line 4729 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp96_); -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 36687 "Photo.c" +#line 36702 "Photo.c" } -#line 4728 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4730 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_it); -#line 36691 "Photo.c" +#line 36706 "Photo.c" } -#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4733 "/home/jens/Source/shotwell/src/Photo.vala" _tmp97_ = media_sources; -#line 4731 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4733 "/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 4676 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4678 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map); -#line 36699 "Photo.c" +#line 36714 "Photo.c" } static void library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { LibraryPhoto* _tmp0_ = NULL; PhotoMetadata* _tmp1_ = NULL; -#line 4735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4737 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4737 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4738 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo; -#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4738 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = metadata; -#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4738 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (self, "master-reimported", _tmp0_, _tmp1_); -#line 36716 "Photo.c" +#line 36731 "Photo.c" } void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4737 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4735 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4737 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_master_reimported (self, photo, metadata); -#line 36725 "Photo.c" +#line 36740 "Photo.c" } static void library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { LibraryPhoto* _tmp0_ = NULL; PhotoMetadata* _tmp1_ = NULL; -#line 4740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4742 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4742 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 4741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4743 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo; -#line 4741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4743 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = metadata; -#line 4741 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4743 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (self, "editable-reimported", _tmp0_, _tmp1_); -#line 36742 "Photo.c" +#line 36757 "Photo.c" } void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4742 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4740 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4742 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_editable_reimported (self, photo, metadata); -#line 36751 "Photo.c" +#line 36766 "Photo.c" } static void library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { LibraryPhoto* _tmp0_ = NULL; PhotoMetadata* _tmp1_ = NULL; -#line 4745 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4747 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4745 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4747 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 4746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo; -#line 4746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = metadata; -#line 4746 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4748 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (self, "source-reimported", _tmp0_, _tmp1_); -#line 36768 "Photo.c" +#line 36783 "Photo.c" } void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4745 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4747 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4745 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4747 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_source_reimported (self, photo, metadata); -#line 36777 "Photo.c" +#line 36792 "Photo.c" } static void library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { LibraryPhoto* _tmp0_ = NULL; PhotoMetadata* _tmp1_ = NULL; -#line 4750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4752 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4752 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 4751 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4753 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo; -#line 4751 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4753 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = metadata; -#line 4751 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4753 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit_by_name (self, "baseline-reimported", _tmp0_, _tmp1_); -#line 36794 "Photo.c" +#line 36809 "Photo.c" } void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4752 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4750 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4752 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_baseline_reimported (self, photo, metadata); -#line 36803 "Photo.c" +#line 36818 "Photo.c" } @@ -36814,38 +36829,38 @@ static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (Me gint64 _tmp0_ = 0LL; PhotoID _tmp1_ = {0}; LibraryPhoto* _tmp2_ = NULL; -#line 4754 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4756 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = numeric_id; -#line 4755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" photo_id_init (&_tmp1_, _tmp0_); -#line 4755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = library_photo_source_collection_fetch (self, &_tmp1_); -#line 4755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource); -#line 4755 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 36825 "Photo.c" +#line 36840 "Photo.c" } static void library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) { GeeCollection* _tmp0_ = NULL; GeeCollection* _tmp1_ = NULL; -#line 4758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4760 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4758 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4760 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 4758 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 4760 "/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" _tmp0_ = added; -#line 4760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4762 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = removed; -#line 4760 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4762 "/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 36844 "Photo.c" +#line 36859 "Photo.c" } @@ -36853,40 +36868,40 @@ static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryP gboolean result = FALSE; DataSource* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 4764 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4766 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE); -#line 4764 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4766 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); -#line 4764 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4766 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); -#line 4765 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = source; -#line 4765 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4767 "/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 4765 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 4765 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 36866 "Photo.c" +#line 36881 "Photo.c" } static void library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) { GeeCollection* _tmp0_ = NULL; GeeCollection* _tmp1_ = NULL; -#line 4768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4770 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4768 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4770 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 4768 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 4770 "/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" _tmp0_ = added; -#line 4770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4772 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = removed; -#line 4770 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4772 "/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 36885 "Photo.c" +#line 36900 "Photo.c" } @@ -36894,21 +36909,21 @@ static gboolean library_photo_source_collection_check_if_offline_photo (LibraryP gboolean result = FALSE; DataSource* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 4774 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4776 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE); -#line 4774 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4776 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); -#line 4774 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4776 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); -#line 4775 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = source; -#line 4775 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4777 "/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 4775 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4777 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 4775 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4777 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 36907 "Photo.c" +#line 36922 "Photo.c" } @@ -36931,7 +36946,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { _tmp3_ = end; #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 36930 "Photo.c" +#line 36945 "Photo.c" glong _tmp4_ = 0L; #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = maxlen; @@ -36939,7 +36954,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = _tmp4_; #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 36938 "Photo.c" +#line 36953 "Photo.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -36951,7 +36966,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = (glong) (_tmp5_ - _tmp6_); #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 36950 "Photo.c" +#line 36965 "Photo.c" } } @@ -36975,21 +36990,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp1_ = offset; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 36974 "Photo.c" +#line 36989 "Photo.c" glong _tmp2_ = 0L; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = len; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); -#line 36980 "Photo.c" +#line 36995 "Photo.c" } else { #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 36984 "Photo.c" +#line 36999 "Photo.c" } #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 36988 "Photo.c" +#line 37003 "Photo.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; @@ -37001,7 +37016,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = _tmp5_; -#line 37000 "Photo.c" +#line 37015 "Photo.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; @@ -37011,13 +37026,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp7_ = _tmp6_; #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; -#line 37010 "Photo.c" +#line 37025 "Photo.c" } #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = offset; #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { -#line 37016 "Photo.c" +#line 37031 "Photo.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; @@ -37031,7 +37046,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp11_ = offset; #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 37030 "Photo.c" +#line 37045 "Photo.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; @@ -37041,13 +37056,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp13_ = string_length; #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 37040 "Photo.c" +#line 37055 "Photo.c" } #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = len; #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { -#line 37046 "Photo.c" +#line 37061 "Photo.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -37056,7 +37071,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp16_ = offset; #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; -#line 37055 "Photo.c" +#line 37070 "Photo.c" } #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = offset; @@ -37076,7 +37091,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { result = _tmp22_; #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 37075 "Photo.c" +#line 37090 "Photo.c" } @@ -37092,37 +37107,37 @@ static MediaSource* library_photo_source_collection_real_fetch_by_source_id (Med gchar* _tmp5_ = NULL; gint64 _tmp6_ = 0LL; MediaSource* _tmp7_ = NULL; -#line 4778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4780 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4778 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4780 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (source_id != NULL, NULL); -#line 4779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = source_id; -#line 4779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4781 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME); -#line 4779 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4781 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp1_, "source_id.has_prefix(Photo.TYPENAME)"); -#line 4780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4782 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = source_id; -#line 4780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4782 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = strlen (PHOTO_TYPENAME); -#line 4780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4782 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 4780 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4782 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = string_substring (_tmp2_, (glong) _tmp4_, (glong) -1); -#line 4780 "/home/jens/Source/shotwell/src/Photo.vala" - numeric_only = _tmp5_; #line 4782 "/home/jens/Source/shotwell/src/Photo.vala" + numeric_only = _tmp5_; +#line 4784 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = parse_int64 (numeric_only, 16); -#line 4782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4784 "/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 4782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4784 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp7_; -#line 4782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4784 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (numeric_only); -#line 4782 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4784 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37121 "Photo.c" +#line 37136 "Photo.c" } @@ -37134,27 +37149,27 @@ static GeeCollection* library_photo_source_collection_real_get_event_source_ids EventID _tmp2_ = {0}; GeeArrayList* _tmp3_ = NULL; GeeCollection* _tmp4_ = NULL; -#line 4785 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4787 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4785 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4787 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (event_id != NULL, NULL); -#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); -#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = *event_id; -#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_table_get_event_source_ids (_tmp1_, &_tmp2_); -#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); -#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4788 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37153 "Photo.c" +#line 37168 "Photo.c" } @@ -37163,21 +37178,21 @@ LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollectio PhotoID _tmp0_ = {0}; gint64 _tmp1_ = 0LL; DataSource* _tmp2_ = NULL; -#line 4789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4791 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4789 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4791 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (photo_id != NULL, NULL); -#line 4790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4792 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = *photo_id; -#line 4790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4792 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_.id; -#line 4790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4792 "/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 4790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4792 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4790 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4792 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37176 "Photo.c" +#line 37191 "Photo.c" } @@ -37186,21 +37201,21 @@ LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPho GeeHashMap* _tmp0_ = NULL; GFile* _tmp1_ = NULL; gpointer _tmp2_ = NULL; -#line 4793 "/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), NULL); -#line 4793 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 4794 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->by_editable_file; -#line 4794 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file; -#line 4794 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4796 "/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 4794 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" result = (LibraryPhoto*) _tmp2_; -#line 4794 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37199 "Photo.c" +#line 37214 "Photo.c" } @@ -37209,21 +37224,21 @@ LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (Lib GeeHashMap* _tmp0_ = NULL; GFile* _tmp1_ = NULL; gpointer _tmp2_ = NULL; -#line 4797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4799 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4797 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4799 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 4798 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->by_raw_development_file; -#line 4798 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file; -#line 4798 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4800 "/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 4798 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" result = (LibraryPhoto*) _tmp2_; -#line 4798 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37222 "Photo.c" +#line 37237 "Photo.c" } @@ -37243,110 +37258,110 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC LibraryPhoto* _tmp17_ = NULL; GeeCollection* _tmp18_ = NULL; GeeCollection* _tmp19_ = NULL; -#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matches_master)); -#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matches_editable)); -#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matches_development)); -#line 4804 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo; -#line 4804 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo)); -#line 4804 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 4804 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = info; -#line 4804 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = backing_photo_row_matches_file_info (_tmp2_, _tmp3_); -#line 4804 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 4804 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp2_); -#line 4804 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4806 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 37270 "Photo.c" +#line 37285 "Photo.c" GeeCollection* _tmp6_ = NULL; LibraryPhoto* _tmp7_ = NULL; -#line 4805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = matches_master; -#line 4805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo; -#line 4805 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" gee_collection_add (_tmp6_, _tmp7_); -#line 37279 "Photo.c" +#line 37294 "Photo.c" } -#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4809 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo; -#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4809 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo)); -#line 4807 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4809 "/home/jens/Source/shotwell/src/Photo.vala" editable = _tmp9_; -#line 4808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = editable; -#line 4808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_ != NULL) { -#line 37291 "Photo.c" +#line 37306 "Photo.c" BackingPhotoRow* _tmp12_ = NULL; GFileInfo* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; -#line 4808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = editable; -#line 4808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = info; -#line 4808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = backing_photo_row_matches_file_info (_tmp12_, _tmp13_); -#line 4808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp14_; -#line 37303 "Photo.c" +#line 37318 "Photo.c" } else { -#line 4808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = FALSE; -#line 37307 "Photo.c" +#line 37322 "Photo.c" } -#line 4808 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4810 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp10_) { -#line 37311 "Photo.c" +#line 37326 "Photo.c" GeeCollection* _tmp15_ = NULL; LibraryPhoto* _tmp16_ = NULL; -#line 4809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = matches_editable; -#line 4809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo; -#line 4809 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" gee_collection_add (_tmp15_, _tmp16_); -#line 37320 "Photo.c" +#line 37335 "Photo.c" } -#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo; -#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo)); -#line 4811 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" development = _tmp18_; -#line 4812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4814 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = development; -#line 4812 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4814 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_ != NULL) { -#line 37332 "Photo.c" +#line 37347 "Photo.c" { GeeIterator* _row_it = NULL; GeeCollection* _tmp20_ = NULL; GeeIterator* _tmp21_ = NULL; -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = development; -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _row_it = _tmp21_; -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37345 "Photo.c" +#line 37360 "Photo.c" GeeIterator* _tmp22_ = NULL; gboolean _tmp23_ = FALSE; BackingPhotoRow* row = NULL; @@ -37355,74 +37370,74 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC BackingPhotoRow* _tmp26_ = NULL; GFileInfo* _tmp27_ = NULL; gboolean _tmp28_ = FALSE; -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _row_it; -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = gee_iterator_next (_tmp22_); -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp23_) { -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37362 "Photo.c" +#line 37377 "Photo.c" } -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = _row_it; -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = gee_iterator_get (_tmp24_); -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" row = (BackingPhotoRow*) _tmp25_; -#line 4814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4816 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = row; -#line 4814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4816 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = info; -#line 4814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4816 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = backing_photo_row_matches_file_info (_tmp26_, _tmp27_); -#line 4814 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4816 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_) { -#line 37378 "Photo.c" +#line 37393 "Photo.c" GeeCollection* _tmp29_ = NULL; LibraryPhoto* _tmp30_ = NULL; -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4817 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = matches_development; -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4817 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = photo; -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" - gee_collection_add (_tmp29_, _tmp30_); #line 4817 "/home/jens/Source/shotwell/src/Photo.vala" + gee_collection_add (_tmp29_, _tmp30_); +#line 4819 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 4817 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4819 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37391 "Photo.c" +#line 37406 "Photo.c" } -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 37395 "Photo.c" +#line 37410 "Photo.c" } -#line 4813 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 37399 "Photo.c" +#line 37414 "Photo.c" } } -#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (development); -#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (editable); -#line 37406 "Photo.c" +#line 37421 "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 4825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matches_master)); -#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matches_editable)); -#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matched_development)); -#line 37421 "Photo.c" +#line 37436 "Photo.c" { GeeIterator* _photo_it = NULL; GeeMultiMap* _tmp0_ = NULL; @@ -37432,27 +37447,27 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour GeeCollection* _tmp4_ = NULL; GeeIterator* _tmp5_ = NULL; GeeIterator* _tmp6_ = NULL; -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->filesize_to_photo; -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = info; -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = g_file_info_get_size (_tmp1_); -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = gee_multi_map_get (_tmp0_, &_tmp2_); -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _photo_it = _tmp6_; -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37451 "Photo.c" +#line 37466 "Photo.c" GeeIterator* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; LibraryPhoto* photo = NULL; @@ -37463,41 +37478,41 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour GeeCollection* _tmp13_ = NULL; GeeCollection* _tmp14_ = NULL; GeeCollection* _tmp15_ = NULL; -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _photo_it; -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = gee_iterator_next (_tmp7_); -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp8_) { -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37470 "Photo.c" +#line 37485 "Photo.c" } -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _photo_it; -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = gee_iterator_get (_tmp9_); -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" photo = (LibraryPhoto*) _tmp10_; -#line 4828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = photo; -#line 4828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = info; -#line 4828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = matches_master; -#line 4828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = matches_editable; -#line 4828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = matched_development; -#line 4828 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_compare_backing (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_); -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 37492 "Photo.c" +#line 37507 "Photo.c" } -#line 4827 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 37496 "Photo.c" +#line 37511 "Photo.c" } { GeeIterator* _media_it = NULL; @@ -37505,21 +37520,21 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour GeeCollection* _tmp17_ = NULL; GeeIterator* _tmp18_ = NULL; GeeIterator* _tmp19_ = NULL; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/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 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp17_); -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _media_it = _tmp19_; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37518 "Photo.c" +#line 37533 "Photo.c" GeeIterator* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; MediaSource* media = NULL; @@ -37530,52 +37545,52 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour GeeCollection* _tmp26_ = NULL; GeeCollection* _tmp27_ = NULL; GeeCollection* _tmp28_ = NULL; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _media_it; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = gee_iterator_next (_tmp20_); -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp21_) { -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37537 "Photo.c" +#line 37552 "Photo.c" } -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _media_it; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = gee_iterator_get (_tmp22_); -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" media = (MediaSource*) _tmp23_; -#line 4831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = media; -#line 4831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = info; -#line 4831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = matches_master; -#line 4831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = matches_editable; -#line 4831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = matched_development; -#line 4831 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4833 "/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 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 37559 "Photo.c" +#line 37574 "Photo.c" } -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 37563 "Photo.c" +#line 37578 "Photo.c" } } void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize, PhotoID* result) { PhotoID _tmp19_ = {0}; -#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); -#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (basename != NULL); -#line 37574 "Photo.c" +#line 37589 "Photo.c" { GeeIterator* _photo_it = NULL; GeeMultiMap* _tmp0_ = NULL; @@ -37584,25 +37599,25 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho GeeCollection* _tmp3_ = NULL; GeeIterator* _tmp4_ = NULL; GeeIterator* _tmp5_ = NULL; -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->filesize_to_photo; -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = filesize; -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_); -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp3_); -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _photo_it = _tmp5_; -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37601 "Photo.c" +#line 37616 "Photo.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; LibraryPhoto* photo = NULL; @@ -37615,72 +37630,72 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho const gchar* _tmp14_ = NULL; gint _tmp15_ = 0; gboolean _tmp16_ = FALSE; -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _photo_it; -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp7_) { -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37622 "Photo.c" +#line 37637 "Photo.c" } -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _photo_it; -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" photo = (LibraryPhoto*) _tmp9_; -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo; -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_; -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = g_file_get_basename (_tmp12_); -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = basename; -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_); -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_ == 0; -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp12_); -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4838 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_) { -#line 37648 "Photo.c" +#line 37663 "Photo.c" LibraryPhoto* _tmp17_ = NULL; PhotoID _tmp18_ = {0}; -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4839 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo; -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4839 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo), &_tmp18_); -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4839 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp18_; -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4839 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4839 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4839 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 37663 "Photo.c" +#line 37678 "Photo.c" } -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 37667 "Photo.c" +#line 37682 "Photo.c" } -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4837 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 37671 "Photo.c" +#line 37686 "Photo.c" } -#line 4840 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4842 "/home/jens/Source/shotwell/src/Photo.vala" photo_id_init (&_tmp19_, PHOTO_ID_INVALID); -#line 4840 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4842 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp19_; -#line 4840 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4842 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 37679 "Photo.c" +#line 37694 "Photo.c" } @@ -37690,23 +37705,23 @@ gboolean library_photo_source_collection_has_basename_filesize_duplicate (Librar gint64 _tmp1_ = 0LL; PhotoID _tmp2_ = {0}; gboolean _tmp3_ = FALSE; -#line 4844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4846 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE); -#line 4844 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4846 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (basename != NULL, FALSE); -#line 4845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = basename; -#line 4845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = filesize; -#line 4845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4847 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_); -#line 4845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4847 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_id_is_valid (&_tmp2_); -#line 4845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4847 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 4845 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4847 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37705 "Photo.c" +#line 37720 "Photo.c" } @@ -37719,54 +37734,54 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS MediaSource* _tmp3_ = NULL; LibraryPhoto* _tmp4_ = NULL; LibraryPhoto* _tmp5_ = NULL; -#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4850 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4850 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/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 4849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = file; -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_); -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp4_; -#line 4850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo; -#line 4850 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ == NULL) { -#line 37740 "Photo.c" +#line 37755 "Photo.c" MediaSourceHoldingTank* _tmp6_ = NULL; LibraryPhotoSourceHoldingTank* _tmp7_ = NULL; GFile* _tmp8_ = NULL; LibraryPhoto* _tmp9_ = NULL; -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4853 "/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 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4853 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4853 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = file; -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4853 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_); -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4853 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4853 "/home/jens/Source/shotwell/src/Photo.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4853 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp7_); -#line 37759 "Photo.c" +#line 37774 "Photo.c" } -#line 4854 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4854 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37765 "Photo.c" +#line 37780 "Photo.c" } @@ -37777,27 +37792,27 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSo const gchar* _tmp2_ = NULL; MediaSource* _tmp3_ = NULL; LibraryPhoto* _tmp4_ = NULL; -#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4859 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4859 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (md5 != NULL, NULL); -#line 4858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4860 "/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 4858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = md5; -#line 4858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_); -#line 4858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 4858 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4860 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37796 "Photo.c" +#line 37811 "Photo.c" } @@ -37810,54 +37825,54 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS MediaSource* _tmp3_ = NULL; LibraryPhoto* _tmp4_ = NULL; LibraryPhoto* _tmp5_ = NULL; -#line 4861 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4863 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4861 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4863 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 4862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4864 "/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 4862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = file; -#line 4862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_); -#line 4862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4862 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp4_; -#line 4863 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4865 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo; -#line 4863 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4865 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ == NULL) { -#line 37831 "Photo.c" +#line 37846 "Photo.c" MediaSourceHoldingTank* _tmp6_ = NULL; LibraryPhotoSourceHoldingTank* _tmp7_ = NULL; GFile* _tmp8_ = NULL; LibraryPhoto* _tmp9_ = NULL; -#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4866 "/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 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); -#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = file; -#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_); -#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4864 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp7_); -#line 37850 "Photo.c" +#line 37865 "Photo.c" } -#line 4867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4869 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4867 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4869 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37856 "Photo.c" +#line 37871 "Photo.c" } @@ -37868,27 +37883,27 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSo const gchar* _tmp2_ = NULL; MediaSource* _tmp3_ = NULL; LibraryPhoto* _tmp4_ = NULL; -#line 4870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4872 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4870 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4872 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (md5 != NULL, NULL); -#line 4871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4873 "/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 4871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = md5; -#line 4871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_); -#line 4871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 4871 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4873 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37887 "Photo.c" +#line 37902 "Photo.c" } @@ -37898,23 +37913,23 @@ gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollec MediaSourceHoldingTank* _tmp1_ = NULL; gint _tmp2_ = 0; gint _tmp3_ = 0; -#line 4874 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4876 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), 0); -#line 4875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4877 "/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 4875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4877 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4877 "/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 4875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4877 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 4875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4877 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4877 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 4875 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4877 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37913 "Photo.c" +#line 37928 "Photo.c" } @@ -37939,169 +37954,169 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou LibraryPhoto* _tmp14_ = NULL; LibraryPhoto* _tmp15_ = NULL; LibraryPhoto* _tmp16_ = NULL; -#line 4878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4880 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); -#line 4878 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4880 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 4879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4881 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = file; -#line 4879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4881 "/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 4879 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4881 "/home/jens/Source/shotwell/src/Photo.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4882 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo; -#line 4880 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4882 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 4881 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE; #line 4883 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE; +#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 4883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 37960 "Photo.c" +#line 37975 "Photo.c" } -#line 4883 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37964 "Photo.c" +#line 37979 "Photo.c" } -#line 4886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; -#line 4886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = library_photo_source_collection_fetch_by_editable_file (self, _tmp3_); -#line 4886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4888 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4886 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4888 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp4_; -#line 4887 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4889 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo; -#line 4887 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4889 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_ != NULL) { -#line 4888 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE; #line 4890 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE; +#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 4890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 37986 "Photo.c" +#line 38001 "Photo.c" } -#line 4890 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37990 "Photo.c" +#line 38005 "Photo.c" } -#line 4893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4895 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = file; -#line 4893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4895 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = library_photo_source_collection_fetch_by_raw_development_file (self, _tmp6_); -#line 4893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4895 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4893 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4895 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp7_; -#line 4894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo; -#line 4894 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4896 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 4895 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER; #line 4897 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER; +#line 4899 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4897 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4899 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 4897 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4899 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38012 "Photo.c" +#line 38027 "Photo.c" } -#line 4897 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4899 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38016 "Photo.c" +#line 38031 "Photo.c" } -#line 4900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = file; -#line 4900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = library_photo_source_collection_get_trashed_by_file (self, _tmp9_); -#line 4900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp10_) : NULL; -#line 4900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_ == NULL) { -#line 4900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp10_); -#line 38028 "Photo.c" +#line 38043 "Photo.c" } -#line 4900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4900 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp11_; -#line 4901 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4903 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo; -#line 4901 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4903 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_ != NULL) { -#line 4902 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH; #line 4904 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH; +#line 4906 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4906 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 4904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4906 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38046 "Photo.c" +#line 38061 "Photo.c" } -#line 4904 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4906 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38050 "Photo.c" +#line 38065 "Photo.c" } -#line 4907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = file; -#line 4907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = library_photo_source_collection_get_offline_by_file (self, _tmp13_); -#line 4907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp14_) : NULL; -#line 4907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_ == NULL) { -#line 4907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp14_); -#line 38062 "Photo.c" +#line 38077 "Photo.c" } -#line 4907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4907 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp15_; -#line 4908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4910 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo; -#line 4908 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4910 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_ != NULL) { -#line 4909 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE; #line 4911 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE; +#line 4913 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; -#line 4911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4913 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 4911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4913 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38080 "Photo.c" +#line 38095 "Photo.c" } -#line 4911 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4913 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38084 "Photo.c" +#line 38099 "Photo.c" } -#line 4914 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN; #line 4916 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN; +#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 4916 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 4916 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { -#line 4916 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38096 "Photo.c" +#line 38111 "Photo.c" } -#line 4916 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4918 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38100 "Photo.c" +#line 38115 "Photo.c" } @@ -38120,67 +38135,67 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect SourceBacklink* _tmp9_ = NULL; gboolean _tmp10_ = FALSE; gboolean _tmp11_ = FALSE; -#line 4919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4919 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (backlink), FALSE); -#line 4920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backlink; -#line 4920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4922 "/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 4920 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4922 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4923 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4923 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38133 "Photo.c" +#line 38148 "Photo.c" } -#line 4923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4925 "/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 4923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 4923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = backlink; -#line 4923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4925 "/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 4923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_; -#line 4923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp3_); -#line 4923 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4925 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 4924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4926 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4924 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4926 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38153 "Photo.c" +#line 38168 "Photo.c" } -#line 4926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/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 4926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 4926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = backlink; -#line 4926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/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 4926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 4926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp8_); -#line 4926 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_) { -#line 4927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4929 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4927 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4929 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38173 "Photo.c" +#line 38188 "Photo.c" } -#line 4929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4931 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 4929 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4931 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38179 "Photo.c" +#line 38194 "Photo.c" } @@ -38193,35 +38208,35 @@ static void library_photo_source_collection_real_remove_backlink (SourceCollecti MediaSourceHoldingTank* _tmp4_ = NULL; SourceBacklink* _tmp5_ = NULL; SourceBacklink* _tmp6_ = NULL; -#line 4932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4934 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4932 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4934 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_SOURCE_BACKLINK (backlink)); -#line 4933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4935 "/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 4933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 4933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4935 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = backlink; -#line 4933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4935 "/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 4933 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4935 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); -#line 4934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4936 "/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 4934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4936 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 4934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4936 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = backlink; -#line 4934 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4936 "/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 4934 "/home/jens/Source/shotwell/src/Photo.vala" - _source_holding_tank_unref0 (_tmp4_); #line 4936 "/home/jens/Source/shotwell/src/Photo.vala" + _source_holding_tank_unref0 (_tmp4_); +#line 4938 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = backlink; -#line 4936 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4938 "/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 38220 "Photo.c" +#line 38235 "Photo.c" } @@ -38230,38 +38245,38 @@ static TransactionController* library_photo_source_collection_real_get_transacti LibraryPhotoSourceCollection* self; TransactionController* _tmp0_ = NULL; TransactionController* _tmp2_ = NULL; -#line 4453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4455 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4456 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->_transaction_controller; -#line 4454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4456 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ == NULL) { -#line 38235 "Photo.c" +#line 38250 "Photo.c" MediaSourceTransactionController* _tmp1_ = NULL; -#line 4455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4457 "/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 4455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4457 "/home/jens/Source/shotwell/src/Photo.vala" _transaction_controller_unref0 (self->priv->_transaction_controller); -#line 4455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4457 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController); -#line 38243 "Photo.c" +#line 38258 "Photo.c" } -#line 4457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4459 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->_transaction_controller; -#line 4457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4459 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 4457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4459 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38251 "Photo.c" +#line 38266 "Photo.c" } static void library_photo_source_collection_real_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4477 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4477 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38260 "Photo.c" +#line 38275 "Photo.c" } @@ -38272,119 +38287,119 @@ static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * clos register gpointer data1; register gpointer data2; cc = (GCClosure *) closure; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (n_param_values == 3); -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" if (G_CCLOSURE_SWAP_DATA (closure)) { -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" data1 = closure->data; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" data2 = param_values->data[0].v_pointer; -#line 38279 "Photo.c" +#line 38294 "Photo.c" } else { -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" data1 = param_values->data[0].v_pointer; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" data2 = closure->data; -#line 38285 "Photo.c" +#line 38300 "Photo.c" } -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" callback = (GMarshalFunc_VOID__OBJECT_MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback); -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/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 38291 "Photo.c" +#line 38306 "Photo.c" } static void library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4478 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4480 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4478 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4480 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38300 "Photo.c" +#line 38315 "Photo.c" } static void library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4483 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4483 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38309 "Photo.c" +#line 38324 "Photo.c" } static void library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { -#line 4484 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4486 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 4484 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4486 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38318 "Photo.c" +#line 38333 "Photo.c" } static void library_photo_source_collection_class_init (LibraryPhotoSourceCollectionClass * klass) { -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_parent_class = g_type_class_peek_parent (klass); -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((DataCollectionClass *) klass)->finalize = library_photo_source_collection_finalize; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" g_type_class_add_private (klass, sizeof (LibraryPhotoSourceCollectionPrivate)); -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->create_trashcan = library_photo_source_collection_real_create_trashcan; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->create_offline_bin = library_photo_source_collection_real_create_offline_bin; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->create_media_monitor = library_photo_source_collection_real_create_media_monitor; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((SourceCollectionClass *) klass)->holds_type_of_source = library_photo_source_collection_real_holds_type_of_source; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->get_typename = library_photo_source_collection_real_get_typename; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->is_file_recognized = library_photo_source_collection_real_is_file_recognized; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((DataCollectionClass *) klass)->notify_contents_altered = library_photo_source_collection_real_notify_contents_altered; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((DataCollectionClass *) klass)->items_altered = library_photo_source_collection_real_items_altered; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->postprocess_imported_media = library_photo_source_collection_real_postprocess_imported_media; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->notify_master_reimported = library_photo_source_collection_real_notify_master_reimported; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->notify_editable_reimported = library_photo_source_collection_real_notify_editable_reimported; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->notify_source_reimported = library_photo_source_collection_real_notify_source_reimported; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->notify_baseline_reimported = library_photo_source_collection_real_notify_baseline_reimported; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = library_photo_source_collection_real_fetch_by_numeric_id; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->fetch_by_source_id = library_photo_source_collection_real_fetch_by_source_id; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceCollectionClass *) klass)->get_event_source_ids = library_photo_source_collection_real_get_event_source_ids; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((SourceCollectionClass *) klass)->has_backlink = library_photo_source_collection_real_has_backlink; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((SourceCollectionClass *) klass)->remove_backlink = library_photo_source_collection_real_remove_backlink; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->master_reimported = library_photo_source_collection_real_master_reimported; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->editable_reimported = library_photo_source_collection_real_editable_reimported; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->baseline_reimported = library_photo_source_collection_real_baseline_reimported; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" ((LibraryPhotoSourceCollectionClass *) klass)->source_reimported = library_photo_source_collection_real_source_reimported; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = library_photo_source_collection_real_get_transaction_controller; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" 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 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" 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 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" 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 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" 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 38383 "Photo.c" +#line 38398 "Photo.c" } @@ -38395,59 +38410,59 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol GeeHashMap* _tmp3_ = NULL; GeeHashMap* _tmp4_ = NULL; GeeTreeMultiMap* _tmp5_ = NULL; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = LIBRARY_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self); -#line 4461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->_transaction_controller = NULL; -#line 4462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); -#line 4462 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->by_editable_file = _tmp0_; #line 4464 "/home/jens/Source/shotwell/src/Photo.vala" + self->priv->by_editable_file = _tmp0_; +#line 4466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, 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" - self->priv->by_raw_development_file = _tmp1_; #line 4466 "/home/jens/Source/shotwell/src/Photo.vala" + self->priv->by_raw_development_file = _tmp1_; +#line 4468 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_tree_multi_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _int64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL); -#line 4466 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->filesize_to_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap); #line 4468 "/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" _tmp3_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL); -#line 4468 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->photo_to_master_filesize = _tmp3_; #line 4470 "/home/jens/Source/shotwell/src/Photo.vala" + self->priv->photo_to_master_filesize = _tmp3_; +#line 4472 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, 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" - self->priv->photo_to_editable_filesize = _tmp4_; #line 4472 "/home/jens/Source/shotwell/src/Photo.vala" + self->priv->photo_to_editable_filesize = _tmp4_; +#line 4474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_tree_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); -#line 4472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4474 "/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 38422 "Photo.c" +#line 38437 "Photo.c" } static void library_photo_source_collection_finalize (DataCollection* obj) { LibraryPhotoSourceCollection * self; -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); -#line 4461 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4463 "/home/jens/Source/shotwell/src/Photo.vala" _transaction_controller_unref0 (self->priv->_transaction_controller); -#line 4462 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (self->priv->by_editable_file); #line 4464 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (self->priv->by_raw_development_file); + _g_object_unref0 (self->priv->by_editable_file); #line 4466 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (self->priv->filesize_to_photo); + _g_object_unref0 (self->priv->by_raw_development_file); #line 4468 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (self->priv->photo_to_master_filesize); + _g_object_unref0 (self->priv->filesize_to_photo); #line 4470 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (self->priv->photo_to_editable_filesize); + _g_object_unref0 (self->priv->photo_to_master_filesize); #line 4472 "/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" _g_object_unref0 (self->priv->photo_to_raw_development_filesize); -#line 4442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4444 "/home/jens/Source/shotwell/src/Photo.vala" DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->finalize (obj); -#line 38446 "Photo.c" +#line 38461 "Photo.c" } @@ -38464,9 +38479,9 @@ GType library_photo_source_collection_get_type (void) { static void _library_photo_generate_thumbnails_one_shot_callback (gpointer self) { -#line 4964 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4966 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_generate_thumbnails ((LibraryPhoto*) self); -#line 38465 "Photo.c" +#line 38480 "Photo.c" } @@ -38478,69 +38493,69 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row) guint64 _tmp3_ = 0ULL; PhotoRow* _tmp7_ = NULL; guint64 _tmp8_ = 0ULL; -#line 4959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4961 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_ROW (row), NULL); -#line 4960 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4962 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = row; -#line 4960 "/home/jens/Source/shotwell/src/Photo.vala" - self = (LibraryPhoto*) photo_construct (object_type, _tmp0_); #line 4962 "/home/jens/Source/shotwell/src/Photo.vala" + self = (LibraryPhoto*) photo_construct (object_type, _tmp0_); +#line 4964 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); -#line 4962 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->import_keywords = NULL; #line 4964 "/home/jens/Source/shotwell/src/Photo.vala" + self->priv->import_keywords = NULL; +#line 4966 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self); -#line 4964 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4966 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler); -#line 4964 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4966 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->thumbnail_scheduler = _tmp1_; -#line 4967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = row; -#line 4967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4969 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->flags; -#line 4967 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4969 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp3_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { -#line 38499 "Photo.c" +#line 38514 "Photo.c" LibraryPhotoSourceCollection* _tmp4_ = NULL; PhotoRow* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; -#line 4968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = library_photo_global; -#line 4968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = row; -#line 4968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->backlinks; -#line 4968 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4970 "/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 38511 "Photo.c" +#line 38526 "Photo.c" } -#line 4970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4972 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = row; -#line 4970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4972 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->flags; -#line 4970 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4972 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { -#line 38519 "Photo.c" +#line 38534 "Photo.c" PhotoRow* _tmp9_ = NULL; guint64 _tmp10_ = 0ULL; -#line 4971 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4973 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = row; -#line 4971 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4973 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_->flags; -#line 4971 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4973 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_upgrade_rating_flags (self, _tmp10_); -#line 38528 "Photo.c" +#line 38543 "Photo.c" } -#line 4959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4961 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 38532 "Photo.c" +#line 38547 "Photo.c" } static LibraryPhoto* library_photo_new (PhotoRow* row) { -#line 4959 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4961 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_construct (TYPE_LIBRARY_PHOTO, row); -#line 38539 "Photo.c" +#line 38554 "Photo.c" } @@ -38558,87 +38573,87 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty PhotoImportParams* _tmp13_ = NULL; PhotoRow* _tmp14_ = NULL; guint64 _tmp15_ = 0ULL; -#line 4974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4976 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (import_params), NULL); -#line 4975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4977 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = import_params; -#line 4975 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4977 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_->row; -#line 4975 "/home/jens/Source/shotwell/src/Photo.vala" - self = (LibraryPhoto*) photo_construct (object_type, _tmp1_); #line 4977 "/home/jens/Source/shotwell/src/Photo.vala" + self = (LibraryPhoto*) photo_construct (object_type, _tmp1_); +#line 4979 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = import_params; -#line 4977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4979 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->keywords; -#line 4977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4979 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _g_object_ref0 (_tmp3_); -#line 4977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4979 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); -#line 4977 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4979 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->import_keywords = _tmp4_; -#line 4978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self); -#line 4978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4980 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler); -#line 4978 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4980 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->thumbnail_scheduler = _tmp5_; -#line 4981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4983 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = import_params; -#line 4981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4983 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_->row; -#line 4981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4983 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_->flags; -#line 4981 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4983 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { -#line 38589 "Photo.c" +#line 38604 "Photo.c" LibraryPhotoSourceCollection* _tmp9_ = NULL; PhotoImportParams* _tmp10_ = NULL; PhotoRow* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; -#line 4982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4984 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = library_photo_global; -#line 4982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4984 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = import_params; -#line 4982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4984 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_->row; -#line 4982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4984 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->backlinks; -#line 4982 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4984 "/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 38604 "Photo.c" +#line 38619 "Photo.c" } -#line 4984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4986 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = import_params; -#line 4984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4986 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _tmp13_->row; -#line 4984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4986 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_->flags; -#line 4984 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4986 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp15_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { -#line 38614 "Photo.c" +#line 38629 "Photo.c" PhotoImportParams* _tmp16_ = NULL; PhotoRow* _tmp17_ = NULL; guint64 _tmp18_ = 0ULL; -#line 4985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = import_params; -#line 4985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_->row; -#line 4985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_->flags; -#line 4985 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4987 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_upgrade_rating_flags (self, _tmp18_); -#line 38626 "Photo.c" +#line 38641 "Photo.c" } -#line 4974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4976 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 38630 "Photo.c" +#line 38645 "Photo.c" } static LibraryPhoto* library_photo_new_from_import_params (PhotoImportParams* import_params) { -#line 4974 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4976 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_construct_from_import_params (TYPE_LIBRARY_PHOTO, import_params); -#line 38637 "Photo.c" +#line 38652 "Photo.c" } @@ -38667,59 +38682,59 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { GeeArrayList* _tmp39_ = NULL; LibraryPhotoSourceCollection* _tmp40_ = NULL; GeeArrayList* _tmp41_ = NULL; -#line 4989 "/home/jens/Source/shotwell/src/Photo.vala" - photo_init_photo (); #line 4991 "/home/jens/Source/shotwell/src/Photo.vala" + photo_init_photo (); +#line 4993 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = library_photo_source_collection_new (); -#line 4991 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4993 "/home/jens/Source/shotwell/src/Photo.vala" _data_collection_unref0 (library_photo_global); -#line 4991 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4993 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_global = _tmp0_; -#line 4995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 4995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 4995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_table_get_all (_tmp2_); -#line 4995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 4995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 4995 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" all = _tmp4_; -#line 4996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 4996 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4998 "/home/jens/Source/shotwell/src/Photo.vala" all_photos = _tmp5_; -#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4999 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 4997 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4999 "/home/jens/Source/shotwell/src/Photo.vala" trashed_photos = _tmp6_; -#line 4998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 4998 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" offline_photos = _tmp7_; -#line 4999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = all; -#line 4999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 4999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tmp9_; -#line 4999 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5001 "/home/jens/Source/shotwell/src/Photo.vala" count = _tmp10_; -#line 38706 "Photo.c" +#line 38721 "Photo.c" { gint ctr = 0; -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" ctr = 0; -#line 38711 "Photo.c" +#line 38726 "Photo.c" { gboolean _tmp11_ = FALSE; -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 38718 "Photo.c" +#line 38733 "Photo.c" gint _tmp13_ = 0; gint _tmp14_ = 0; PhotoRow* row = NULL; @@ -38735,159 +38750,159 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { guint64 _tmp22_ = 0ULL; ProgressMonitor _tmp30_ = NULL; void* _tmp30__target = NULL; -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp11_) { -#line 38736 "Photo.c" +#line 38751 "Photo.c" gint _tmp12_ = 0; -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = ctr; -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" ctr = _tmp12_ + 1; -#line 38742 "Photo.c" +#line 38757 "Photo.c" } -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = ctr; -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = count; -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp13_ < _tmp14_)) { -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 38754 "Photo.c" +#line 38769 "Photo.c" } -#line 5001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = all; -#line 5001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = ctr; -#line 5001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5003 "/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 5001 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" row = (PhotoRow*) _tmp17_; -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5004 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = row; -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5004 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = library_photo_new (_tmp18_); -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5004 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp19_; -#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5005 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = row; -#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5005 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_->flags; -#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" - flags = _tmp21_; #line 5005 "/home/jens/Source/shotwell/src/Photo.vala" + flags = _tmp21_; +#line 5007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = flags; -#line 5005 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5007 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp22_ & LIBRARY_PHOTO_FLAG_TRASH) != ((guint64) 0)) { -#line 38780 "Photo.c" +#line 38795 "Photo.c" GeeArrayList* _tmp23_ = NULL; LibraryPhoto* _tmp24_ = NULL; -#line 5006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5008 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = trashed_photos; -#line 5006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5008 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = photo; -#line 5006 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5008 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); -#line 38789 "Photo.c" +#line 38804 "Photo.c" } else { guint64 _tmp25_ = 0ULL; -#line 5007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5009 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = flags; -#line 5007 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5009 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp25_ & LIBRARY_PHOTO_FLAG_OFFLINE) != ((guint64) 0)) { -#line 38796 "Photo.c" +#line 38811 "Photo.c" GeeArrayList* _tmp26_ = NULL; LibraryPhoto* _tmp27_ = NULL; -#line 5008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5010 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = offline_photos; -#line 5008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5010 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = photo; -#line 5008 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5010 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_); -#line 38805 "Photo.c" +#line 38820 "Photo.c" } else { GeeArrayList* _tmp28_ = NULL; LibraryPhoto* _tmp29_ = NULL; -#line 5010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5012 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = all_photos; -#line 5010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5012 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = photo; -#line 5010 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5012 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); -#line 38815 "Photo.c" +#line 38830 "Photo.c" } } -#line 5012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = monitor; -#line 5012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30__target = monitor_target; -#line 5012 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5014 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp30_ != NULL) { -#line 38824 "Photo.c" +#line 38839 "Photo.c" ProgressMonitor _tmp31_ = NULL; void* _tmp31__target = NULL; gint _tmp32_ = 0; gint _tmp33_ = 0; -#line 5013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = monitor; -#line 5013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31__target = monitor_target; -#line 5013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = ctr; -#line 5013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = count; -#line 5013 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5015 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ ((guint64) _tmp32_, (guint64) _tmp33_, TRUE, _tmp31__target); -#line 38839 "Photo.c" +#line 38854 "Photo.c" } -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 5000 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (row); -#line 38845 "Photo.c" +#line 38860 "Photo.c" } } } -#line 5016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5018 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = library_photo_global; -#line 5016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5018 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = all_photos; -#line 5016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5018 "/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 5016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5018 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tmp36_; -#line 5016 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5018 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp37_); -#line 5017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = library_photo_global; -#line 5017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5019 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = trashed_photos; -#line 5017 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5019 "/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 5018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = library_photo_global; -#line 5018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = offline_photos; -#line 5018 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5020 "/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 4988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4990 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (offline_photos); -#line 4988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4990 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (trashed_photos); -#line 4988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4990 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (all_photos); -#line 4988 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4990 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (all); -#line 38879 "Photo.c" +#line 38894 "Photo.c" } void library_photo_terminate (void) { -#line 5022 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5024 "/home/jens/Source/shotwell/src/Photo.vala" photo_terminate_photo (); -#line 38886 "Photo.c" +#line 38901 "Photo.c" } @@ -38904,139 +38919,139 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot gboolean _tmp6_ = FALSE; PhotoImportParams* _tmp7_ = NULL; LibraryPhoto* _tmp8_ = NULL; -#line 5029 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0); #line 5031 "/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" _tmp0_ = photo_table_get_instance (); -#line 5031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 5031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = params; -#line 5031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->row; -#line 5031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_add (_tmp1_, _tmp3_, &_tmp4_); -#line 5031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 5031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); -#line 5031 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" photo_id = _tmp5_; -#line 5032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_id_is_invalid (&photo_id); -#line 5032 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5034 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5035 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_photo = NULL; #line 5035 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_photo = NULL; +#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_DATABASE_ERROR; -#line 5035 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" if (photo) { -#line 5035 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" *photo = _vala_photo; -#line 38935 "Photo.c" +#line 38950 "Photo.c" } else { -#line 5035 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 38939 "Photo.c" +#line 38954 "Photo.c" } -#line 5035 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5037 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38943 "Photo.c" +#line 38958 "Photo.c" } -#line 5039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5041 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = params; -#line 5039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5041 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = library_photo_new_from_import_params (_tmp7_); -#line 5039 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5041 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 5039 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_photo = _tmp8_; #line 5041 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_photo = _tmp8_; +#line 5043 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_SUCCESS; -#line 5041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5043 "/home/jens/Source/shotwell/src/Photo.vala" if (photo) { -#line 5041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5043 "/home/jens/Source/shotwell/src/Photo.vala" *photo = _vala_photo; -#line 38959 "Photo.c" +#line 38974 "Photo.c" } else { -#line 5041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5043 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 38963 "Photo.c" +#line 38978 "Photo.c" } -#line 5041 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5043 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38967 "Photo.c" +#line 38982 "Photo.c" } void library_photo_import_failed (LibraryPhoto* photo) { GError * _inner_error_ = NULL; -#line 5044 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5046 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 38975 "Photo.c" +#line 38990 "Photo.c" { PhotoTable* _tmp0_ = NULL; PhotoTable* _tmp1_ = NULL; LibraryPhoto* _tmp2_ = NULL; PhotoID _tmp3_ = {0}; -#line 5046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); -#line 5046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 5046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo; -#line 5046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo), &_tmp3_); -#line 5046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_remove (_tmp1_, &_tmp3_, &_inner_error_); -#line 5046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); -#line 5046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 38997 "Photo.c" - goto __catch405_database_error; +#line 39012 "Photo.c" + goto __catch406_database_error; } -#line 5046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5048 "/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 5046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 5046 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39006 "Photo.c" +#line 39021 "Photo.c" } } - goto __finally405; - __catch405_database_error: + goto __finally406; + __catch406_database_error: { GError* err = NULL; GError* _tmp4_ = NULL; -#line 5045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5047 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 5045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5047 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5050 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = err; -#line 5048 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5050 "/home/jens/Source/shotwell/src/Photo.vala" app_window_database_error (_tmp4_); -#line 5045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5047 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39024 "Photo.c" +#line 39039 "Photo.c" } - __finally405: -#line 5045 "/home/jens/Source/shotwell/src/Photo.vala" + __finally406: +#line 5047 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5047 "/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 5045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5047 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 5045 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5047 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39035 "Photo.c" +#line 39050 "Photo.c" } } @@ -39046,21 +39061,21 @@ static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetad PhotoMetadata* _tmp0_ = NULL; LibraryPhotoSourceCollection* _tmp1_ = NULL; PhotoMetadata* _tmp2_ = NULL; -#line 5052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5054 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5052 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5054 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 5053 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5055 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = metadata; -#line 5053 "/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 5055 "/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" _tmp1_ = library_photo_global; -#line 5055 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5057 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 5055 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5057 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_notify_master_reimported (_tmp1_, self, _tmp2_); -#line 39059 "Photo.c" +#line 39074 "Photo.c" } @@ -39069,21 +39084,21 @@ static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMet PhotoMetadata* _tmp0_ = NULL; LibraryPhotoSourceCollection* _tmp1_ = NULL; PhotoMetadata* _tmp2_ = NULL; -#line 5058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5060 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5058 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5060 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 5059 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = metadata; -#line 5059 "/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 5061 "/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" _tmp1_ = library_photo_global; -#line 5061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5063 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 5061 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5063 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_notify_editable_reimported (_tmp1_, self, _tmp2_); -#line 39082 "Photo.c" +#line 39097 "Photo.c" } @@ -39092,21 +39107,21 @@ static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetad PhotoMetadata* _tmp0_ = NULL; LibraryPhotoSourceCollection* _tmp1_ = NULL; PhotoMetadata* _tmp2_ = NULL; -#line 5064 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5066 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5064 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5066 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 5065 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = metadata; -#line 5065 "/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 5067 "/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" _tmp1_ = library_photo_global; -#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5069 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5069 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_notify_source_reimported (_tmp1_, self, _tmp2_); -#line 39105 "Photo.c" +#line 39120 "Photo.c" } @@ -39115,80 +39130,80 @@ static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMet PhotoMetadata* _tmp0_ = NULL; LibraryPhotoSourceCollection* _tmp1_ = NULL; PhotoMetadata* _tmp2_ = NULL; -#line 5070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5072 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5070 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5072 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 5071 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5073 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = metadata; -#line 5071 "/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 5073 "/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" _tmp1_ = library_photo_global; -#line 5073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5075 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 5073 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5075 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_notify_baseline_reimported (_tmp1_, self, _tmp2_); -#line 39128 "Photo.c" +#line 39143 "Photo.c" } static void library_photo_generate_thumbnails (LibraryPhoto* self) { GError * _inner_error_ = NULL; -#line 5076 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5078 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); -#line 39136 "Photo.c" +#line 39151 "Photo.c" { -#line 5078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5080 "/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 5078 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5080 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 39142 "Photo.c" - goto __catch406_g_error; +#line 39157 "Photo.c" + goto __catch407_g_error; } } - goto __finally406; - __catch406_g_error: + goto __finally407; + __catch407_g_error: { GError* err = NULL; gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; GError* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 5077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 5077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 5080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 5080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 5080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = err; -#line 5080 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->message; -#line 5080 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:5080: Unable to generate thumbnails for %s: %s", _tmp1_, _tmp3_); -#line 5080 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp1_); -#line 5077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39172 "Photo.c" +#line 39187 "Photo.c" } - __finally406: -#line 5077 "/home/jens/Source/shotwell/src/Photo.vala" + __finally407: +#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5079 "/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 5077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 5077 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5079 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39183 "Photo.c" +#line 39198 "Photo.c" } -#line 5084 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5086 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 39187 "Photo.c" +#line 39202 "Photo.c" } @@ -39196,28 +39211,28 @@ GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) { GeeCollection* result = NULL; GeeCollection* _tmp0_ = NULL; GeeCollection* _tmp1_ = NULL; -#line 5088 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5090 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL); -#line 5089 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5091 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->import_keywords; -#line 5089 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5091 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 5089 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5091 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 5089 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5091 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39205 "Photo.c" +#line 39220 "Photo.c" } void library_photo_clear_import_keywords (LibraryPhoto* self) { -#line 5092 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5094 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); -#line 5093 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5095 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); -#line 5093 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5095 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->import_keywords = NULL; -#line 39216 "Photo.c" +#line 39231 "Photo.c" } @@ -39226,44 +39241,44 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; Alteration* _tmp5_ = NULL; -#line 5096 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5096 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_if_fail (IS_ALTERATION (alteration)); #line 5098 "/home/jens/Source/shotwell/src/Photo.vala" + g_return_if_fail (IS_ALTERATION (alteration)); +#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->block_thumbnail_generation; -#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp1_) { -#line 39233 "Photo.c" +#line 39248 "Photo.c" Alteration* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = alteration; -#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = alteration_has_subject (_tmp2_, "image"); -#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_; -#line 39242 "Photo.c" +#line 39257 "Photo.c" } else { -#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 39246 "Photo.c" +#line 39261 "Photo.c" } -#line 5098 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5100 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 39250 "Photo.c" +#line 39265 "Photo.c" OneShotScheduler* _tmp4_ = NULL; -#line 5099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5101 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->thumbnail_scheduler; -#line 5099 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5101 "/home/jens/Source/shotwell/src/Photo.vala" one_shot_scheduler_at_priority_idle (_tmp4_, G_PRIORITY_LOW); -#line 39256 "Photo.c" +#line 39271 "Photo.c" } -#line 5101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = alteration; -#line 5101 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5103 "/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 39262 "Photo.c" +#line 39277 "Photo.c" } @@ -39274,31 +39289,31 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal GdkPixbuf* _tmp0_ = NULL; GdkPixbuf* _tmp1_ = NULL; GError * _inner_error_ = NULL; -#line 5104 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5106 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5104 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5106 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 5105 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5107 "/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 5105 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5107 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = _tmp0_; -#line 5105 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5107 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5105 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5107 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5105 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5107 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39287 "Photo.c" +#line 39302 "Photo.c" } -#line 5107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5109 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_BILINEAR, TRUE); -#line 5107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5109 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 5107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5109 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 5107 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5109 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39297 "Photo.c" +#line 39312 "Photo.c" } @@ -39306,71 +39321,71 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) { LibraryPhoto * self; Rotation _tmp0_ = 0; GError * _inner_error_ = NULL; -#line 5110 "/home/jens/Source/shotwell/src/Photo.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5112 "/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" self->priv->block_thumbnail_generation = TRUE; -#line 5113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5115 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = rotation; -#line 5113 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5115 "/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 5114 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5116 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->block_thumbnail_generation = FALSE; -#line 39315 "Photo.c" +#line 39330 "Photo.c" { Rotation _tmp1_ = 0; -#line 5122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5124 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = rotation; -#line 5122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5124 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_cache_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_); -#line 5122 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5124 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 39324 "Photo.c" - goto __catch407_g_error; +#line 39339 "Photo.c" + goto __catch408_g_error; } } - goto __finally407; - __catch407_g_error: + goto __finally408; + __catch408_g_error: { GError* err = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; GError* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 5121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5123 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 5121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5123 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 5125 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5127 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 5125 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5127 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 5125 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5127 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = err; -#line 5125 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5127 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->message; -#line 5125 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:5125: Unable to update thumbnails for %s: %s", _tmp3_, _tmp5_); -#line 5125 "/home/jens/Source/shotwell/src/Photo.vala" +#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" _g_free0 (_tmp3_); -#line 5121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5123 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39354 "Photo.c" +#line 39369 "Photo.c" } - __finally407: -#line 5121 "/home/jens/Source/shotwell/src/Photo.vala" + __finally408: +#line 5123 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5123 "/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 5121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5123 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 5121 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5123 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39365 "Photo.c" +#line 39380 "Photo.c" } -#line 5128 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5130 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 39369 "Photo.c" +#line 39384 "Photo.c" } @@ -39382,40 +39397,40 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint GdkPixbuf* _tmp2_ = NULL; GdkPixbuf* _tmp3_ = NULL; GError * _inner_error_ = NULL; -#line 5132 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5134 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = scale; -#line 5133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5135 "/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 5133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp2_; -#line 5133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39395 "Photo.c" +#line 39410 "Photo.c" } -#line 5133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp0_; -#line 5133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; -#line 5133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 5133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 5133 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5135 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39407 "Photo.c" +#line 39422 "Photo.c" } static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, gint64 total_num_bytes, gpointer self) { -#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_on_duplicate_progress ((LibraryPhoto*) self, current_num_bytes, total_num_bytes); -#line 39414 "Photo.c" +#line 39429 "Photo.c" } @@ -39430,53 +39445,53 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh GFile* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; GError * _inner_error_ = NULL; -#line 5138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5140 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); -#line 5138 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5140 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((backing == NULL) || IS_BACKING_PHOTO_ROW (backing)); -#line 5139 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5141 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_id_init (&backing_id, BACKING_PHOTO_ID_INVALID); -#line 5140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = backing; -#line 5140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 5140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 39441 "Photo.c" +#line 39456 "Photo.c" } else { BackingPhotoRow* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 5140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = backing; -#line 5140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_->filepath; -#line 5140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp3_ == NULL; -#line 39451 "Photo.c" +#line 39466 "Photo.c" } -#line 5140 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5142 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 5141 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5143 "/home/jens/Source/shotwell/src/Photo.vala" *result = backing_id; -#line 5141 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5143 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39459 "Photo.c" +#line 39474 "Photo.c" } -#line 5143 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = backing; -#line 5143 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->filepath; -#line 5143 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = g_file_new_for_path (_tmp5_); -#line 5143 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" file = _tmp6_; -#line 5144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = file; -#line 5144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = g_file_query_exists (_tmp7_, NULL); -#line 5144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 39475 "Photo.c" +#line 39490 "Photo.c" GFile* dupe_file = NULL; GFile* _tmp9_ = NULL; GFile* _tmp10_ = NULL; @@ -39486,105 +39501,105 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh DetectedPhotoInformation* _tmp12_ = NULL; BackingPhotoRow* _tmp13_ = NULL; BackingPhotoRow* _tmp14_ = NULL; -#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = file; -#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5147 "/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 5145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" dupe_file = _tmp10_; -#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 5145 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5147 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39499 "Photo.c" +#line 39514 "Photo.c" } -#line 5148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = dupe_file; -#line 5148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5150 "/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 5148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 5148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" detected = _tmp12_; -#line 5148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" state = _tmp13_; -#line 5148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 5148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 5148 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39523 "Photo.c" +#line 39538 "Photo.c" } -#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5152 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = state; -#line 5150 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5152 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 39529 "Photo.c" +#line 39544 "Photo.c" BackingPhotoTable* _tmp15_ = NULL; BackingPhotoTable* _tmp16_ = NULL; BackingPhotoRow* _tmp17_ = NULL; BackingPhotoRow* _tmp18_ = NULL; BackingPhotoID _tmp19_ = {0}; -#line 5151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = backing_photo_table_get_instance (); -#line 5151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 5151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = state; -#line 5151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_table_add (_tmp16_, _tmp17_, &_inner_error_); -#line 5151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp16_); -#line 5151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (state); -#line 5151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 5151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 5151 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5153 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39559 "Photo.c" +#line 39574 "Photo.c" } -#line 5152 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = state; -#line 5152 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_->id; -#line 5152 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" backing_id = _tmp19_; -#line 39567 "Photo.c" +#line 39582 "Photo.c" } -#line 5144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (state); -#line 5144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 5144 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5146 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 39575 "Photo.c" +#line 39590 "Photo.c" } -#line 5156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5158 "/home/jens/Source/shotwell/src/Photo.vala" *result = backing_id; -#line 5156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5158 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 5156 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5158 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39583 "Photo.c" +#line 39598 "Photo.c" } @@ -39649,231 +39664,231 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { GeeList* _tmp51_ = NULL; GeeCollection* _tmp52_ = NULL; GError * _inner_error_ = NULL; -#line 5159 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL); #line 5161 "/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" _tmp0_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5163 "/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 5161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; -#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" dupe_file = _tmp3_; -#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5163 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39668 "Photo.c" +#line 39683 "Photo.c" } -#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)); -#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; -#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_duplicate_backing_photo (self, _tmp5_, &_tmp6_, &_inner_error_); -#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; -#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp5_); -#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" dupe_editable_id = _tmp7_; -#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5166 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39690 "Photo.c" +#line 39705 "Photo.c" } -#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5167 "/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 5165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_duplicate_backing_photo (self, _tmp9_, &_tmp10_, &_inner_error_); -#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp9_); -#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" dupe_raw_shotwell_id = _tmp11_; -#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39712 "Photo.c" +#line 39727 "Photo.c" } -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/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 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp12_; -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_duplicate_backing_photo (self, _tmp13_, &_tmp14_, &_inner_error_); -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp14_; -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp13_); -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" dupe_raw_camera_id = _tmp15_; -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5167 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39734 "Photo.c" +#line 39749 "Photo.c" } -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5171 "/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 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = _tmp16_; -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_duplicate_backing_photo (self, _tmp17_, &_tmp18_, &_inner_error_); -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = _tmp18_; -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp17_); -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" dupe_raw_embedded_id = _tmp19_; -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5169 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5171 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39756 "Photo.c" +#line 39771 "Photo.c" } -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo_table_get_instance (); -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp20_; -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), &_tmp22_); -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = dupe_file; -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = g_file_get_path (_tmp23_); -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_; -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = dupe_editable_id; -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = dupe_raw_shotwell_id; -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = dupe_raw_camera_id; -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = dupe_raw_embedded_id; -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_duplicate (_tmp21_, &_tmp22_, _tmp25_, &_tmp26_, &_tmp27_, &_tmp28_, &_tmp29_, &_tmp30_); -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = _tmp30_; -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp25_); -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp21_); -#line 5173 "/home/jens/Source/shotwell/src/Photo.vala" - dupe_id = _tmp31_; #line 5175 "/home/jens/Source/shotwell/src/Photo.vala" + dupe_id = _tmp31_; +#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = photo_table_get_instance (); -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tmp32_; -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = dupe_id; -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = photo_table_get_row (_tmp33_, &_tmp34_); -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = _tmp35_; -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp33_); -#line 5175 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5177 "/home/jens/Source/shotwell/src/Photo.vala" dupe_row = _tmp36_; -#line 5178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = dupe_row; -#line 5178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5180 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = library_photo_new (_tmp37_); -#line 5178 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5180 "/home/jens/Source/shotwell/src/Photo.vala" dupe = _tmp38_; -#line 5181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = dupe; -#line 5181 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5183 "/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 5184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = library_photo_global; -#line 5184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = dupe; -#line 5184 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5186 "/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 5187 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5189 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = dupe; -#line 5187 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5189 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5187 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5189 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp43_; -#line 5187 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5189 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp44_ != NULL; -#line 5187 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5189 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp44_); -#line 5187 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5189 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp45_) { -#line 39830 "Photo.c" +#line 39845 "Photo.c" LibraryPhoto* _tmp46_ = NULL; Event* _tmp47_ = NULL; Event* _tmp48_ = NULL; LibraryPhoto* _tmp49_ = NULL; -#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = dupe; -#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _tmp47_; -#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = dupe; -#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" event_attach (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5188 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5190 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp48_); -#line 39847 "Photo.c" +#line 39862 "Photo.c" } -#line 5191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = tag_global; -#line 5191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5193 "/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 5191 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection); -#line 5192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = tags; -#line 5192 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp52_ != NULL) { -#line 39859 "Photo.c" +#line 39874 "Photo.c" { GeeIterator* _tag_it = NULL; GeeCollection* _tmp53_ = NULL; GeeIterator* _tmp54_ = NULL; -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = tags; -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" _tag_it = _tmp54_; -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 39872 "Photo.c" +#line 39887 "Photo.c" GeeIterator* _tmp55_ = NULL; gboolean _tmp56_ = FALSE; Tag* tag = NULL; @@ -39881,84 +39896,84 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { gpointer _tmp58_ = NULL; Tag* _tmp59_ = NULL; LibraryPhoto* _tmp60_ = NULL; -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _tag_it; -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = gee_iterator_next (_tmp55_); -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp56_) { -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 39888 "Photo.c" +#line 39903 "Photo.c" } -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = _tag_it; -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = gee_iterator_get (_tmp57_); -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" tag = (Tag*) _tmp58_; -#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5196 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = tag; -#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5196 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = dupe; -#line 5194 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5196 "/home/jens/Source/shotwell/src/Photo.vala" tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 39904 "Photo.c" +#line 39919 "Photo.c" } -#line 5193 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5195 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_it); -#line 39908 "Photo.c" +#line 39923 "Photo.c" } } -#line 5198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5200 "/home/jens/Source/shotwell/src/Photo.vala" result = dupe; -#line 5198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5200 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tags); -#line 5198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5200 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (dupe_row); -#line 5198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5200 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 5198 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5200 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39921 "Photo.c" +#line 39936 "Photo.c" } static void library_photo_on_duplicate_progress (LibraryPhoto* self, gint64 current, gint64 total) { -#line 5201 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5203 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); -#line 5202 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5204 "/home/jens/Source/shotwell/src/Photo.vala" spin_event_loop (); -#line 39930 "Photo.c" +#line 39945 "Photo.c" } static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flags) { guint64 _tmp0_ = 0ULL; guint64 _tmp1_ = 0ULL; -#line 5205 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5207 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); -#line 5206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5208 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = flags; -#line 5206 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5208 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp0_ & LIBRARY_PHOTO_FLAG_HIDDEN) != ((guint64) 0)) { -#line 5207 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5209 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_REJECTED); -#line 5208 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5210 "/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 39947 "Photo.c" +#line 39962 "Photo.c" } -#line 5211 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5213 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = flags; -#line 5211 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5213 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp1_ & LIBRARY_PHOTO_FLAG_FAVORITE) != ((guint64) 0)) { -#line 5212 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_FIVE); -#line 5213 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5215 "/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 39957 "Photo.c" +#line 39972 "Photo.c" } } @@ -39967,35 +39982,35 @@ static gboolean library_photo_real_is_trashed (MediaSource* base) { LibraryPhoto * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 5218 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5220 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5221 "/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 5219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5221 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 5219 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5221 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39974 "Photo.c" +#line 39989 "Photo.c" } static void library_photo_real_trash (MediaSource* base) { LibraryPhoto * self; -#line 5222 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5224 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5223 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5225 "/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 39984 "Photo.c" +#line 39999 "Photo.c" } static void library_photo_real_untrash (MediaSource* base) { LibraryPhoto * self; -#line 5226 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5228 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5227 "/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_TRASH, NULL); -#line 39994 "Photo.c" +#line 40009 "Photo.c" } @@ -40003,35 +40018,35 @@ static gboolean library_photo_real_is_offline (Monitorable* base) { LibraryPhoto * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 5230 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5232 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5233 "/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 5231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5233 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 5231 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5233 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40010 "Photo.c" +#line 40025 "Photo.c" } static void library_photo_real_mark_offline (Monitorable* base) { LibraryPhoto * self; -#line 5234 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5236 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5235 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5237 "/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 40020 "Photo.c" +#line 40035 "Photo.c" } static void library_photo_real_mark_online (Monitorable* base) { LibraryPhoto * self; -#line 5238 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5240 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5239 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5241 "/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 40030 "Photo.c" +#line 40045 "Photo.c" } @@ -40039,15 +40054,15 @@ static gboolean library_photo_real_is_flagged (Flaggable* base) { LibraryPhoto * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 5242 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5244 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5245 "/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 5243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5245 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; -#line 5243 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5245 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40046 "Photo.c" +#line 40061 "Photo.c" } @@ -40055,17 +40070,17 @@ static void library_photo_real_mark_flagged (Flaggable* base) { LibraryPhoto * self; Alteration* _tmp0_ = NULL; Alteration* _tmp1_ = NULL; -#line 5246 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5248 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = alteration_new ("metadata", "flagged"); -#line 5247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5249 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 5247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5249 "/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 5247 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5249 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp1_); -#line 40064 "Photo.c" +#line 40079 "Photo.c" } @@ -40073,17 +40088,17 @@ static void library_photo_real_mark_unflagged (Flaggable* base) { LibraryPhoto * self; Alteration* _tmp0_ = NULL; Alteration* _tmp1_ = NULL; -#line 5250 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5252 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = alteration_new ("metadata", "flagged"); -#line 5251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5253 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; -#line 5251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5253 "/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 5251 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5253 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp1_); -#line 40082 "Photo.c" +#line 40097 "Photo.c" } @@ -40094,35 +40109,35 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; GError * _inner_error_ = NULL; -#line 5254 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5256 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5259 "/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 5257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5259 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _tmp1_; -#line 5257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5259 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5259 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); -#line 5257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5259 "/home/jens/Source/shotwell/src/Photo.vala" return FALSE; -#line 40105 "Photo.c" +#line 40120 "Photo.c" } -#line 5257 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5259 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp0_) { -#line 5258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5260 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 5258 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5260 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40113 "Photo.c" +#line 40128 "Photo.c" } -#line 5260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5262 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5262 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 5260 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5262 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40121 "Photo.c" +#line 40136 "Photo.c" } @@ -40131,76 +40146,76 @@ static void library_photo_real_destroy (DataSource* base) { PhotoID photo_id = {0}; PhotoID _tmp0_ = {0}; GError * _inner_error_ = NULL; -#line 5263 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5265 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5266 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), &_tmp0_); -#line 5264 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5266 "/home/jens/Source/shotwell/src/Photo.vala" photo_id = _tmp0_; -#line 5267 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5269 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 40138 "Photo.c" +#line 40153 "Photo.c" { PhotoTable* _tmp1_ = NULL; PhotoTable* _tmp2_ = NULL; PhotoID _tmp3_ = {0}; -#line 5273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); -#line 5273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; -#line 5273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_id; -#line 5273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" photo_table_remove (_tmp2_, &_tmp3_, &_inner_error_); -#line 5273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); -#line 5273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 40157 "Photo.c" - goto __catch408_database_error; +#line 40172 "Photo.c" + goto __catch409_database_error; } -#line 5273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5275 "/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 5273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 5273 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40166 "Photo.c" +#line 40181 "Photo.c" } } - goto __finally408; - __catch408_database_error: + goto __finally409; + __catch409_database_error: { GError* err = NULL; GError* _tmp4_ = NULL; -#line 5272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5274 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; -#line 5272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5274 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5277 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = err; -#line 5275 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5277 "/home/jens/Source/shotwell/src/Photo.vala" app_window_database_error (_tmp4_); -#line 5272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5274 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 40184 "Photo.c" +#line 40199 "Photo.c" } - __finally408: -#line 5272 "/home/jens/Source/shotwell/src/Photo.vala" + __finally409: +#line 5274 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5274 "/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 5272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5274 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); -#line 5272 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5274 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40195 "Photo.c" +#line 40210 "Photo.c" } -#line 5278 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5280 "/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 40199 "Photo.c" +#line 40214 "Photo.c" } @@ -40212,25 +40227,25 @@ gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbna PhotoFileFormat _tmp3_ = 0; PhotoID _tmp4_ = {0}; gboolean _tmp5_ = FALSE; -#line 5281 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); #line 5283 "/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" _tmp0_ = file; -#line 5283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = thumbnail_md5; -#line 5283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = full_md5; -#line 5283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file_format; -#line 5283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_get_nontrash_duplicate (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_); -#line 5283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_id_is_valid (&_tmp4_); -#line 5283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 5283 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5285 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40229 "Photo.c" +#line 40244 "Photo.c" } @@ -40250,79 +40265,79 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m PhotoID* _tmp10_ = NULL; gint _tmp10__length1 = 0; PhotoID _tmp18_ = {0}; -#line 5286 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_if_fail ((file == NULL) || G_IS_FILE (file)); #line 5288 "/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" _tmp0_ = file; -#line 5288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = thumbnail_md5; -#line 5288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = full_md5; -#line 5288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file_format; -#line 5288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = photo_get_duplicate_ids (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_); -#line 5288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" ids = _tmp5_; -#line 5288 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" ids_length1 = _tmp4_; -#line 5288 "/home/jens/Source/shotwell/src/Photo.vala" - _ids_size_ = ids_length1; #line 5290 "/home/jens/Source/shotwell/src/Photo.vala" + _ids_size_ = ids_length1; +#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = ids; -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7__length1 = ids_length1; -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_ == NULL) { -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = TRUE; -#line 40275 "Photo.c" +#line 40290 "Photo.c" } else { PhotoID* _tmp8_ = NULL; gint _tmp8__length1 = 0; -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = ids; -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8__length1 = ids_length1; -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp8__length1 == 0; -#line 40285 "Photo.c" +#line 40300 "Photo.c" } -#line 5290 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5292 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_) { -#line 40289 "Photo.c" +#line 40304 "Photo.c" PhotoID _tmp9_ = {0}; -#line 5291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" photo_id_init (&_tmp9_, PHOTO_ID_INVALID); -#line 5291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp9_; -#line 5291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" ids = (g_free (ids), NULL); -#line 5291 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40299 "Photo.c" +#line 40314 "Photo.c" } -#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = ids; -#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10__length1 = ids_length1; -#line 40305 "Photo.c" +#line 40320 "Photo.c" { PhotoID* id_collection = NULL; gint id_collection_length1 = 0; gint _id_collection_size_ = 0; gint id_it = 0; -#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" id_collection = _tmp10_; -#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" id_collection_length1 = _tmp10__length1; -#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) { -#line 40317 "Photo.c" +#line 40332 "Photo.c" PhotoID id = {0}; -#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" id = id_collection[id_it]; -#line 40321 "Photo.c" +#line 40336 "Photo.c" { LibraryPhoto* photo = NULL; LibraryPhotoSourceCollection* _tmp11_ = NULL; @@ -40330,60 +40345,60 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m LibraryPhoto* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; LibraryPhoto* _tmp15_ = NULL; -#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = library_photo_global; -#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = id; -#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = library_photo_source_collection_fetch (_tmp11_, &_tmp12_); -#line 5294 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp13_; -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo; -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_ != NULL) { -#line 40341 "Photo.c" +#line 40356 "Photo.c" LibraryPhoto* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo; -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = !_tmp17_; -#line 40350 "Photo.c" +#line 40365 "Photo.c" } else { -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = FALSE; -#line 40354 "Photo.c" +#line 40369 "Photo.c" } -#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5297 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_) { -#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5298 "/home/jens/Source/shotwell/src/Photo.vala" *result = id; -#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5298 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5298 "/home/jens/Source/shotwell/src/Photo.vala" ids = (g_free (ids), NULL); -#line 5296 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5298 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40366 "Photo.c" +#line 40381 "Photo.c" } -#line 5293 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5295 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 40370 "Photo.c" +#line 40385 "Photo.c" } } } -#line 5299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5301 "/home/jens/Source/shotwell/src/Photo.vala" photo_id_init (&_tmp18_, PHOTO_ID_INVALID); -#line 5299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5301 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp18_; -#line 5299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5301 "/home/jens/Source/shotwell/src/Photo.vala" ids = (g_free (ids), NULL); -#line 5299 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5301 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40382 "Photo.c" +#line 40397 "Photo.c" } @@ -40412,179 +40427,179 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { gint _tmp27_ = 0; gboolean _tmp28_ = FALSE; GeeList* _tmp29_ = NULL; -#line 5302 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5305 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = tag_global; -#line 5303 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5305 "/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 5303 "/home/jens/Source/shotwell/src/Photo.vala" - tags = _tmp1_; #line 5305 "/home/jens/Source/shotwell/src/Photo.vala" + tags = _tmp1_; +#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource)); -#line 5305 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" metadata = _tmp2_; -#line 5306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5308 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = metadata; -#line 5306 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5308 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ == NULL) { -#line 40427 "Photo.c" +#line 40442 "Photo.c" gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; GeeList* _tmp6_ = NULL; -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = tags; -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != NULL) { -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = TRUE; -#line 40437 "Photo.c" +#line 40452 "Photo.c" } else { GeeList* _tmp7_ = NULL; gint _tmp8_ = 0; gint _tmp9_ = 0; -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = tags; -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp9_ > 0; -#line 40450 "Photo.c" +#line 40465 "Photo.c" } -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = TRUE; -#line 40456 "Photo.c" +#line 40471 "Photo.c" } else { Rating _tmp10_ = 0; -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp10_ != RATING_UNRATED; -#line 40463 "Photo.c" +#line 40478 "Photo.c" } -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tags); -#line 5307 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40473 "Photo.c" +#line 40488 "Photo.c" } -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = metadata; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = photo_metadata_get_rating (_tmp12_); -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5311 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp11_ != _tmp13_) { -#line 5310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 5310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 5310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tags); -#line 5310 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40491 "Photo.c" +#line 40506 "Photo.c" } -#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = metadata; -#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_metadata_get_keywords (_tmp14_, NULL, NULL, NULL); -#line 5312 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" keywords = _tmp15_; -#line 5313 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = tags; -#line 5313 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp17_ != NULL) { -#line 40503 "Photo.c" +#line 40518 "Photo.c" GeeList* _tmp18_ = NULL; gint _tmp19_ = 0; gint _tmp20_ = 0; -#line 5313 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = tags; -#line 5313 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5313 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp19_; -#line 5313 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp20_; -#line 40515 "Photo.c" +#line 40530 "Photo.c" } else { -#line 5313 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = 0; -#line 40519 "Photo.c" +#line 40534 "Photo.c" } -#line 5313 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5315 "/home/jens/Source/shotwell/src/Photo.vala" tags_count = _tmp16_; -#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = keywords; -#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_ != NULL) { -#line 40527 "Photo.c" +#line 40542 "Photo.c" GeeSet* _tmp23_ = NULL; gint _tmp24_ = 0; gint _tmp25_ = 0; -#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = keywords; -#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _tmp24_; -#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp25_; -#line 40539 "Photo.c" +#line 40554 "Photo.c" } else { -#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = 0; -#line 40543 "Photo.c" +#line 40558 "Photo.c" } -#line 5314 "/home/jens/Source/shotwell/src/Photo.vala" - keywords_count = _tmp21_; #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" + keywords_count = _tmp21_; +#line 5318 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = tags_count; -#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5318 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = keywords_count; -#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5318 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp26_ != _tmp27_) { -#line 5317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 5317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (keywords); -#line 5317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 5317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tags); -#line 5317 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40563 "Photo.c" +#line 40578 "Photo.c" } -#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = tags; -#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_ != NULL) { -#line 40569 "Photo.c" +#line 40584 "Photo.c" GeeSet* _tmp30_ = NULL; -#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = keywords; -#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _tmp30_ != NULL; -#line 40575 "Photo.c" +#line 40590 "Photo.c" } else { -#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = FALSE; -#line 40579 "Photo.c" +#line 40594 "Photo.c" } -#line 5319 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_) { -#line 40583 "Photo.c" +#line 40598 "Photo.c" { GeeList* _tag_list = NULL; GeeList* _tmp31_ = NULL; @@ -40594,25 +40609,25 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { gint _tmp34_ = 0; gint _tmp35_ = 0; gint _tag_index = 0; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = tags; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = _g_object_ref0 (_tmp31_); -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tag_list = _tmp32_; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = _tag_list; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tag_size = _tmp35_; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tag_index = -1; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40611 "Photo.c" +#line 40626 "Photo.c" gint _tmp36_ = 0; gint _tmp37_ = 0; gint _tmp38_ = 0; @@ -40628,86 +40643,86 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { gchar* _tmp47_ = NULL; gboolean _tmp48_ = FALSE; gboolean _tmp49_ = FALSE; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = _tag_index; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tag_index = _tmp36_ + 1; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = _tag_index; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tag_size; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp37_ < _tmp38_)) { -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 40639 "Photo.c" +#line 40654 "Photo.c" } -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = _tag_list; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = _tag_index; -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = gee_list_get (_tmp39_, _tmp40_); -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" tag = (Tag*) _tmp41_; -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = keywords; -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = tag; -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_OBJECT, DataObject)); -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _tmp44_; -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = g_utf8_normalize (_tmp45_, (gssize) -1, G_NORMALIZE_DEFAULT); -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _tmp46_; -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection), _tmp47_); -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = !_tmp48_; -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp47_); -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp45_); -#line 5321 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5323 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp49_) { -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_list); -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (keywords); -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tags); -#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5324 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40685 "Photo.c" +#line 40700 "Photo.c" } -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 40689 "Photo.c" +#line 40704 "Photo.c" } -#line 5320 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5322 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_list); -#line 40693 "Photo.c" +#line 40708 "Photo.c" } } -#line 5326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 5326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (keywords); -#line 5326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 5326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tags); -#line 5326 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40706 "Photo.c" +#line 40721 "Photo.c" } @@ -40719,30 +40734,30 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM GeeList* _tmp2_ = NULL; PhotoMetadata* _tmp22_ = NULL; Rating _tmp23_ = 0; -#line 5329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5331 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5331 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); -#line 5330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5332 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = tag_global; -#line 5330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5332 "/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 5330 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5332 "/home/jens/Source/shotwell/src/Photo.vala" photo_tags = _tmp1_; -#line 5331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_tags; -#line 5331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 40732 "Photo.c" +#line 40747 "Photo.c" GeeCollection* string_tags = NULL; GeeArrayList* _tmp3_ = NULL; PhotoMetadata* _tmp19_ = NULL; GeeCollection* _tmp20_ = NULL; -#line 5332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); -#line 5332 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" string_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 40741 "Photo.c" +#line 40756 "Photo.c" { GeeList* _tag_list = NULL; GeeList* _tmp4_ = NULL; @@ -40752,25 +40767,25 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM gint _tmp7_ = 0; gint _tmp8_ = 0; gint _tag_index = 0; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_tags; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tag_list = _tmp5_; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tag_list; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp7_; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tag_size = _tmp8_; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tag_index = -1; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40769 "Photo.c" +#line 40784 "Photo.c" gint _tmp9_ = 0; gint _tmp10_ = 0; gint _tmp11_ = 0; @@ -40782,74 +40797,74 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM Tag* _tmp16_ = NULL; gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tag_index; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tag_index = _tmp9_ + 1; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = _tag_index; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tag_size; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" if (!(_tmp10_ < _tmp11_)) { -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 40793 "Photo.c" +#line 40808 "Photo.c" } -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tag_list; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tag_index; -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = gee_list_get (_tmp12_, _tmp13_); -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" tag = (Tag*) _tmp14_; -#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = string_tags; -#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = tag; -#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); -#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = _tmp17_; -#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" gee_collection_add (_tmp15_, _tmp18_); -#line 5334 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp18_); -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 40817 "Photo.c" +#line 40832 "Photo.c" } -#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5335 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_list); -#line 40821 "Photo.c" +#line 40836 "Photo.c" } -#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = metadata; -#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = string_tags; -#line 5336 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5338 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_keywords (_tmp19_, _tmp20_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 5331 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5333 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (string_tags); -#line 40831 "Photo.c" +#line 40846 "Photo.c" } else { PhotoMetadata* _tmp21_ = NULL; -#line 5338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5340 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = metadata; -#line 5338 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5340 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_keywords (_tmp21_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 40838 "Photo.c" +#line 40853 "Photo.c" } -#line 5340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = metadata; -#line 5340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5340 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" photo_metadata_set_rating (_tmp22_, _tmp23_); -#line 5329 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5331 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo_tags); -#line 40848 "Photo.c" +#line 40863 "Photo.c" } @@ -40863,63 +40878,63 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph GeeSet* _tmp7_ = NULL; GeeCollection* _tmp8_ = NULL; HierarchicalTagIndex* _tmp39_ = NULL; -#line 5343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5345 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 5343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5345 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); -#line 5344 "/home/jens/Source/shotwell/src/Photo.vala" - new_htag_index = NULL; #line 5346 "/home/jens/Source/shotwell/src/Photo.vala" + new_htag_index = NULL; +#line 5348 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = metadata; -#line 5346 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5348 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_metadata_has_hierarchical_keywords (_tmp0_); -#line 5346 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5348 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 40874 "Photo.c" +#line 40889 "Photo.c" PhotoMetadata* _tmp2_ = NULL; GeeSet* _tmp3_ = NULL; GeeSet* _tmp4_ = NULL; HierarchicalTagIndex* _tmp5_ = NULL; -#line 5347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5349 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = metadata; -#line 5347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5349 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = photo_metadata_get_hierarchical_keywords (_tmp2_); -#line 5347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5349 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_; -#line 5347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5349 "/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 5347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5349 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (new_htag_index); -#line 5347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5349 "/home/jens/Source/shotwell/src/Photo.vala" new_htag_index = _tmp5_; -#line 5347 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5349 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp4_); -#line 40893 "Photo.c" +#line 40908 "Photo.c" } -#line 5351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = metadata; -#line 5351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo_metadata_get_keywords (_tmp6_, NULL, NULL, NULL); -#line 5351 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection); -#line 5352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = keywords; -#line 5352 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 40905 "Photo.c" +#line 40920 "Photo.c" { GeeIterator* _keyword_it = NULL; GeeCollection* _tmp9_ = NULL; GeeIterator* _tmp10_ = NULL; -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = keywords; -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _keyword_it = _tmp10_; -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40918 "Photo.c" +#line 40933 "Photo.c" GeeIterator* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; gchar* keyword = NULL; @@ -40942,156 +40957,156 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph const gchar* _tmp36_ = NULL; Tag* _tmp37_ = NULL; Tag* _tmp38_ = NULL; -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _keyword_it; -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = gee_iterator_next (_tmp11_); -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp12_) { -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 40949 "Photo.c" +#line 40964 "Photo.c" } -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _keyword_it; -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = gee_iterator_get (_tmp13_); -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" keyword = (gchar*) _tmp14_; -#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = new_htag_index; -#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp16_ != NULL) { -#line 40961 "Photo.c" +#line 40976 "Photo.c" HierarchicalTagIndex* _tmp17_ = NULL; const gchar* _tmp18_ = NULL; gboolean _tmp19_ = FALSE; -#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = new_htag_index; -#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = keyword; -#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = hierarchical_tag_index_is_tag_in_index (_tmp17_, _tmp18_); -#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = _tmp19_; -#line 40973 "Photo.c" +#line 40988 "Photo.c" } else { -#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = FALSE; -#line 40977 "Photo.c" +#line 40992 "Photo.c" } -#line 5354 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5356 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5357 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5357 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 40985 "Photo.c" +#line 41000 "Photo.c" } -#line 5357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5359 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = keyword; -#line 5357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5359 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp20_); -#line 5357 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5359 "/home/jens/Source/shotwell/src/Photo.vala" safe_keyword = _tmp21_; -#line 5358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = safe_keyword; -#line 5358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5360 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp22_); -#line 5358 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5360 "/home/jens/Source/shotwell/src/Photo.vala" promoted_keyword = _tmp23_; -#line 5361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = tag_global; -#line 5361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = safe_keyword; -#line 5361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5363 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = tag_source_collection_exists (_tmp24_, _tmp25_, FALSE); -#line 5361 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5363 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp26_) { -#line 41007 "Photo.c" +#line 41022 "Photo.c" const gchar* _tmp27_ = NULL; Tag* _tmp28_ = NULL; Tag* _tmp29_ = NULL; -#line 5362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = safe_keyword; -#line 5362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = tag_for_path (_tmp27_); -#line 5362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = _tmp28_; -#line 5362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" tag_attach (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5362 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5364 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp29_); -#line 5363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5365 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (promoted_keyword); -#line 5363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5365 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (safe_keyword); -#line 5363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5365 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 5363 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5365 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41029 "Photo.c" +#line 41044 "Photo.c" } -#line 5366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = tag_global; -#line 5366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = promoted_keyword; -#line 5366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = tag_source_collection_exists (_tmp30_, _tmp31_, FALSE); -#line 5366 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp32_) { -#line 41039 "Photo.c" +#line 41054 "Photo.c" const gchar* _tmp33_ = NULL; Tag* _tmp34_ = NULL; Tag* _tmp35_ = NULL; -#line 5367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5369 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = promoted_keyword; -#line 5367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5369 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = tag_for_path (_tmp33_); -#line 5367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5369 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = _tmp34_; -#line 5367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5369 "/home/jens/Source/shotwell/src/Photo.vala" tag_attach (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5367 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5369 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp35_); -#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5370 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (promoted_keyword); -#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5370 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (safe_keyword); -#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5370 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5370 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41061 "Photo.c" +#line 41076 "Photo.c" } -#line 5371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = keyword; -#line 5371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = tag_for_path (_tmp36_); -#line 5371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = _tmp37_; -#line 5371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5373 "/home/jens/Source/shotwell/src/Photo.vala" tag_attach (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5371 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5373 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp38_); -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (promoted_keyword); -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (safe_keyword); -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 41079 "Photo.c" +#line 41094 "Photo.c" } -#line 5353 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5355 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_keyword_it); -#line 41083 "Photo.c" +#line 41098 "Photo.c" } } -#line 5375 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5377 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = new_htag_index; -#line 5375 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5377 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp39_ != NULL) { -#line 41090 "Photo.c" +#line 41105 "Photo.c" { GeeIterator* _path_it = NULL; HierarchicalTagIndex* _tmp40_ = NULL; @@ -41099,23 +41114,23 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph GeeCollection* _tmp42_ = NULL; GeeIterator* _tmp43_ = NULL; GeeIterator* _tmp44_ = NULL; -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = new_htag_index; -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = hierarchical_tag_index_get_all_paths (_tmp40_); -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = _tmp41_; -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = _tmp43_; -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp42_); -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _path_it = _tmp44_; -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41114 "Photo.c" +#line 41129 "Photo.c" GeeIterator* _tmp45_ = NULL; gboolean _tmp46_ = FALSE; gchar* path = NULL; @@ -41124,150 +41139,150 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph const gchar* _tmp49_ = NULL; Tag* _tmp50_ = NULL; Tag* _tmp51_ = NULL; -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _path_it; -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = gee_iterator_next (_tmp45_); -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp46_) { -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41131 "Photo.c" +#line 41146 "Photo.c" } -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = _path_it; -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = gee_iterator_get (_tmp47_); -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" path = (gchar*) _tmp48_; -#line 5377 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5379 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = path; -#line 5377 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5379 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = tag_for_path (_tmp49_); -#line 5377 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5379 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = _tmp50_; -#line 5377 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5379 "/home/jens/Source/shotwell/src/Photo.vala" tag_attach (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5377 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5379 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp51_); -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (path); -#line 41151 "Photo.c" +#line 41166 "Photo.c" } -#line 5376 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5378 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_path_it); -#line 41155 "Photo.c" +#line 41170 "Photo.c" } } -#line 5343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5345 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (keywords); -#line 5343 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5345 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (new_htag_index); -#line 41162 "Photo.c" +#line 41177 "Photo.c" } static void library_photo_class_init (LibraryPhotoClass * klass) { -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_parent_class = g_type_class_peek_parent (klass); -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" g_type_class_add_private (klass, sizeof (LibraryPhotoPrivate)); -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->notify_master_reimported = library_photo_real_notify_master_reimported; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->notify_editable_reimported = library_photo_real_notify_editable_reimported; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->notify_source_reimported = library_photo_real_notify_source_reimported; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->notify_baseline_reimported = library_photo_real_notify_baseline_reimported; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((DataObjectClass *) klass)->notify_altered = library_photo_real_notify_altered; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->get_preview_pixbuf = library_photo_real_get_preview_pixbuf; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->rotate = library_photo_real_rotate; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((ThumbnailSourceClass *) klass)->get_thumbnail = library_photo_real_get_thumbnail; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->is_trashed = library_photo_real_is_trashed; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->trash = library_photo_real_trash; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->untrash = library_photo_real_untrash; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->is_offline = library_photo_real_is_offline; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->mark_offline = library_photo_real_mark_offline; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((MediaSourceClass *) klass)->mark_online = library_photo_real_mark_online; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((DataSourceClass *) klass)->internal_delete_backing = library_photo_real_internal_delete_backing; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((DataSourceClass *) klass)->destroy = library_photo_real_destroy; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->has_user_generated_metadata = library_photo_real_has_user_generated_metadata; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->set_user_metadata_for_export = library_photo_real_set_user_metadata_for_export; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoClass *) klass)->apply_user_metadata_for_reimport = library_photo_real_apply_user_metadata_for_reimport; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (klass)->finalize = library_photo_finalize; -#line 41211 "Photo.c" +#line 41226 "Photo.c" } static void library_photo_flaggable_interface_init (FlaggableIface * iface) { -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_flaggable_parent_iface = g_type_interface_peek_parent (iface); -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" iface->is_flagged = (gboolean (*)(Flaggable*)) library_photo_real_is_flagged; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" iface->mark_flagged = (void (*)(Flaggable*)) library_photo_real_mark_flagged; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" iface->mark_unflagged = (void (*)(Flaggable*)) library_photo_real_mark_unflagged; -#line 41224 "Photo.c" +#line 41239 "Photo.c" } static void library_photo_monitorable_interface_init (MonitorableIface * iface) { -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_monitorable_parent_iface = g_type_interface_peek_parent (iface); -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" iface->is_offline = (gboolean (*)(Monitorable*)) library_photo_real_is_offline; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" iface->mark_offline = (void (*)(Monitorable*)) library_photo_real_mark_offline; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" iface->mark_online = (void (*)(Monitorable*)) library_photo_real_mark_online; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" iface->set_master_file = (void (*)(Monitorable*, GFile*)) photo_set_master_file; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" iface->set_master_timestamp = (void (*)(Monitorable*, GFileInfo*)) photo_set_master_timestamp; -#line 41241 "Photo.c" +#line 41256 "Photo.c" } static void library_photo_instance_init (LibraryPhoto * self) { -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = LIBRARY_PHOTO_GET_PRIVATE (self); -#line 4955 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4957 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->block_thumbnail_generation = FALSE; -#line 4956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4958 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->thumbnail_scheduler = NULL; -#line 41252 "Photo.c" +#line 41267 "Photo.c" } static void library_photo_finalize (GObject* obj) { LibraryPhoto * self; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO, LibraryPhoto); -#line 4956 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4958 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler); -#line 4957 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4959 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" +#line 4946 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (library_photo_parent_class)->finalize (obj); -#line 41266 "Photo.c" +#line 41281 "Photo.c" } @@ -41294,30 +41309,30 @@ LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GTyp void* _tmp1__target = NULL; GetSourceDatabaseKey _tmp2_ = NULL; void* _tmp2__target = NULL; -#line 5393 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (sources), NULL); #line 5395 "/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" _tmp0_ = sources; -#line 5395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = check_to_keep; -#line 5395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1__target = check_to_keep_target; -#line 5395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = get_key; -#line 5395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2__target = get_key_target; -#line 5395 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5397 "/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 5393 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5395 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 41309 "Photo.c" +#line 41324 "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 5393 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5395 "/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 41316 "Photo.c" +#line 41331 "Photo.c" } @@ -41331,59 +41346,59 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh GeeHashMap* _tmp4_ = NULL; GFile* _tmp5_ = NULL; gpointer _tmp6_ = NULL; -#line 5398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5400 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self), NULL); -#line 5398 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5400 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 5399 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5401 "/home/jens/Source/shotwell/src/Photo.vala" ret = NULL; -#line 5400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->editable_file_map; -#line 5400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5402 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = file; -#line 5400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5402 "/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 5400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5402 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (ret); -#line 5400 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5402 "/home/jens/Source/shotwell/src/Photo.vala" ret = (LibraryPhoto*) _tmp2_; -#line 5401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5403 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = ret; -#line 5401 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5403 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 5402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" result = ret; -#line 5402 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 41354 "Photo.c" +#line 41369 "Photo.c" } -#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5406 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->development_file_map; -#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5406 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = file; -#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5406 "/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 5404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5406 "/home/jens/Source/shotwell/src/Photo.vala" result = (LibraryPhoto*) _tmp6_; -#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5406 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (ret); -#line 5404 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5406 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 41368 "Photo.c" +#line 41383 "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 5428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5430 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_on_editable_replaced ((LibraryPhotoSourceHoldingTank*) self, _sender, old_file, new_file); -#line 41375 "Photo.c" +#line 41390 "Photo.c" } static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) { -#line 5429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_on_raw_development_modified ((LibraryPhotoSourceHoldingTank*) self, _sender); -#line 41382 "Photo.c" +#line 41397 "Photo.c" } @@ -41393,30 +41408,30 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour GeeCollection* _tmp40_ = NULL; GeeCollection* _tmp81_ = NULL; GeeCollection* _tmp82_ = NULL; -#line 5407 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5409 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); -#line 5407 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5409 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 5407 "/home/jens/Source/shotwell/src/Photo.vala" - g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 5409 "/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" _tmp0_ = added; -#line 5409 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5411 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ != NULL) { -#line 41402 "Photo.c" +#line 41417 "Photo.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp1_ = NULL; GeeIterator* _tmp2_ = NULL; -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = added; -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _source_it = _tmp2_; -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41415 "Photo.c" +#line 41430 "Photo.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; DataSource* source = NULL; @@ -41435,41 +41450,41 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour GeeCollection* _tmp25_ = NULL; LibraryPhoto* _tmp38_ = NULL; LibraryPhoto* _tmp39_ = NULL; -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _source_it; -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp4_) { -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41442 "Photo.c" +#line 41457 "Photo.c" } -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _source_it; -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" source = (DataSource*) _tmp6_; -#line 5411 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5413 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = source; -#line 5411 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5413 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 5411 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5413 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp8_; -#line 5414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = photo; -#line 5414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo)); -#line 5414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 5414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_ != NULL; -#line 5414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp11_); -#line 5414 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 41468 "Photo.c" +#line 41483 "Photo.c" GeeHashMap* _tmp13_ = NULL; LibraryPhoto* _tmp14_ = NULL; GFile* _tmp15_ = NULL; @@ -41480,60 +41495,60 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour LibraryPhoto* _tmp20_ = NULL; GFile* _tmp21_ = NULL; GFile* _tmp22_ = NULL; -#line 5415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5417 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->editable_file_map; -#line 5415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5417 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo; -#line 5415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5417 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo)); -#line 5415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5417 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = _tmp15_; -#line 5415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5417 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = photo; -#line 5415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5417 "/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 5415 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5417 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp16_); -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->priv->reverse_editable_file_map; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = photo; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = _tmp21_; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp18_, _tmp19_, _tmp22_); -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5418 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp22_); -#line 41507 "Photo.c" +#line 41522 "Photo.c" } -#line 5420 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo; -#line 5420 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo)); -#line 5420 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" raw_files = _tmp24_; -#line 5421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5423 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = raw_files; -#line 5421 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5423 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp25_ != NULL) { -#line 41519 "Photo.c" +#line 41534 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp26_ = NULL; GeeIterator* _tmp27_ = NULL; -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = raw_files; -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp27_; -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41532 "Photo.c" +#line 41547 "Photo.c" GeeIterator* _tmp28_ = NULL; gboolean _tmp29_ = FALSE; GFile* f = NULL; @@ -41545,86 +41560,86 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour GeeMultiMap* _tmp35_ = NULL; LibraryPhoto* _tmp36_ = NULL; GFile* _tmp37_ = NULL; -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = _f_it; -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = gee_iterator_next (_tmp28_); -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp29_) { -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41552 "Photo.c" +#line 41567 "Photo.c" } -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = _f_it; -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = gee_iterator_get (_tmp30_); -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp31_; -#line 5423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = self->priv->development_file_map; -#line 5423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = f; -#line 5423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = photo; -#line 5423 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5425 "/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 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5426 "/home/jens/Source/shotwell/src/Photo.vala" _tmp35_ = self->priv->reverse_development_file_map; -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5426 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = photo; -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5426 "/home/jens/Source/shotwell/src/Photo.vala" _tmp37_ = f; -#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5426 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp35_, _tmp36_, _tmp37_); -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 41578 "Photo.c" +#line 41593 "Photo.c" } -#line 5422 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5424 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 41582 "Photo.c" +#line 41597 "Photo.c" } } -#line 5428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5430 "/home/jens/Source/shotwell/src/Photo.vala" _tmp38_ = photo; -#line 5428 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5430 "/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 5429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _tmp39_ = photo; -#line 5429 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5431 "/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 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_files); -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (source); -#line 41599 "Photo.c" +#line 41614 "Photo.c" } -#line 5410 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5412 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_source_it); -#line 41603 "Photo.c" +#line 41618 "Photo.c" } } -#line 5433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5435 "/home/jens/Source/shotwell/src/Photo.vala" _tmp40_ = removed; -#line 5433 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5435 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp40_ != NULL) { -#line 41610 "Photo.c" +#line 41625 "Photo.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp41_ = NULL; GeeIterator* _tmp42_ = NULL; -#line 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp41_ = removed; -#line 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp42_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _source_it = _tmp42_; -#line 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41623 "Photo.c" +#line 41638 "Photo.c" GeeIterator* _tmp43_ = NULL; gboolean _tmp44_ = FALSE; DataSource* source = NULL; @@ -41641,29 +41656,29 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour guint _tmp78_ = 0U; LibraryPhoto* _tmp79_ = NULL; guint _tmp80_ = 0U; -#line 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp43_ = _source_it; -#line 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_ = gee_iterator_next (_tmp43_); -#line 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp44_) { -#line 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41648 "Photo.c" +#line 41663 "Photo.c" } -#line 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp45_ = _source_it; -#line 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _tmp46_ = gee_iterator_get (_tmp45_); -#line 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" source = (DataSource*) _tmp46_; -#line 5435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = source; -#line 5435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 5435 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp48_; -#line 41662 "Photo.c" +#line 41677 "Photo.c" { GeeIterator* _f_it = NULL; GeeMultiMap* _tmp49_ = NULL; @@ -41672,25 +41687,25 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour GeeCollection* _tmp52_ = NULL; GeeIterator* _tmp53_ = NULL; GeeIterator* _tmp54_ = NULL; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = self->priv->reverse_editable_file_map; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = photo; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp51_ = gee_multi_map_get (_tmp49_, _tmp50_); -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = _tmp51_; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp53_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = _tmp53_; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp52_); -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp54_; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41689 "Photo.c" +#line 41704 "Photo.c" GeeIterator* _tmp55_ = NULL; gboolean _tmp56_ = FALSE; GFile* f = NULL; @@ -41698,35 +41713,35 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour gpointer _tmp58_ = NULL; GeeHashMap* _tmp59_ = NULL; GFile* _tmp60_ = NULL; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _f_it; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = gee_iterator_next (_tmp55_); -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp56_) { -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41705 "Photo.c" +#line 41720 "Photo.c" } -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp57_ = _f_it; -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp58_ = gee_iterator_get (_tmp57_); -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp58_; -#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" _tmp59_ = self->priv->editable_file_map; -#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" _tmp60_ = f; -#line 5437 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5439 "/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 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 41721 "Photo.c" +#line 41736 "Photo.c" } -#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5438 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 41725 "Photo.c" +#line 41740 "Photo.c" } { GeeIterator* _f_it = NULL; @@ -41736,25 +41751,25 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour GeeCollection* _tmp64_ = NULL; GeeIterator* _tmp65_ = NULL; GeeIterator* _tmp66_ = NULL; -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _tmp61_ = self->priv->reverse_development_file_map; -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _tmp62_ = photo; -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _tmp63_ = gee_multi_map_get (_tmp61_, _tmp62_); -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _tmp64_ = _tmp63_; -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _tmp65_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _tmp66_ = _tmp65_; -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp64_); -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp66_; -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41753 "Photo.c" +#line 41768 "Photo.c" GeeIterator* _tmp67_ = NULL; gboolean _tmp68_ = FALSE; GFile* f = NULL; @@ -41762,78 +41777,78 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour gpointer _tmp70_ = NULL; GeeHashMap* _tmp71_ = NULL; GFile* _tmp72_ = NULL; -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _tmp67_ = _f_it; -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _tmp68_ = gee_iterator_next (_tmp67_); -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp68_) { -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41769 "Photo.c" +#line 41784 "Photo.c" } -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _tmp69_ = _f_it; -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _tmp70_ = gee_iterator_get (_tmp69_); -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp70_; -#line 5440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5442 "/home/jens/Source/shotwell/src/Photo.vala" _tmp71_ = self->priv->development_file_map; -#line 5440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5442 "/home/jens/Source/shotwell/src/Photo.vala" _tmp72_ = f; -#line 5440 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5442 "/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 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 41785 "Photo.c" +#line 41800 "Photo.c" } -#line 5439 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5441 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 41789 "Photo.c" +#line 41804 "Photo.c" } -#line 5442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp73_ = self->priv->reverse_editable_file_map; -#line 5442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp74_ = photo; -#line 5442 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5444 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove_all (_tmp73_, _tmp74_); -#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp75_ = self->priv->reverse_development_file_map; -#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp76_ = photo; -#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove_all (_tmp75_, _tmp76_); #line 5445 "/home/jens/Source/shotwell/src/Photo.vala" + gee_multi_map_remove_all (_tmp75_, _tmp76_); +#line 5447 "/home/jens/Source/shotwell/src/Photo.vala" _tmp77_ = photo; -#line 5445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5447 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp78_, NULL, FALSE); -#line 5445 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5447 "/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 5446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5448 "/home/jens/Source/shotwell/src/Photo.vala" _tmp79_ = photo; -#line 5446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5448 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp80_, NULL, FALSE); -#line 5446 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5448 "/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 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (source); -#line 41819 "Photo.c" +#line 41834 "Photo.c" } -#line 5434 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5436 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_source_it); -#line 41823 "Photo.c" +#line 41838 "Photo.c" } } -#line 5450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp81_ = added; -#line 5450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp82_ = removed; -#line 5450 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5452 "/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 41832 "Photo.c" +#line 41847 "Photo.c" } @@ -41847,79 +41862,79 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto GeeMultiMap* _tmp13_ = NULL; LibraryPhoto* _tmp14_ = NULL; GFile* _tmp15_ = NULL; -#line 5453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self)); -#line 5453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (_photo)); -#line 5453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file)); -#line 5453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file)); -#line 5454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5456 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _photo; -#line 5454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5456 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL); -#line 5454 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5456 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp1_; -#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo; -#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp2_ != NULL, "photo != null"); #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" + _vala_assert (_tmp2_ != NULL, "photo != null"); +#line 5459 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = old_file; -#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5459 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 41868 "Photo.c" +#line 41883 "Photo.c" GeeHashMap* _tmp4_ = NULL; GFile* _tmp5_ = NULL; GeeMultiMap* _tmp6_ = NULL; LibraryPhoto* _tmp7_ = NULL; GFile* _tmp8_ = NULL; -#line 5458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->editable_file_map; -#line 5458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = old_file; -#line 5458 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5460 "/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 5459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->reverse_editable_file_map; -#line 5459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo; -#line 5459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5461 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = old_file; -#line 5459 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5461 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove (_tmp6_, _tmp7_, _tmp8_); -#line 41888 "Photo.c" +#line 41903 "Photo.c" } -#line 5462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = new_file; -#line 5462 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5464 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp9_ != NULL) { -#line 41894 "Photo.c" +#line 41909 "Photo.c" GeeHashMap* _tmp10_ = NULL; GFile* _tmp11_ = NULL; LibraryPhoto* _tmp12_ = NULL; -#line 5463 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5465 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->priv->editable_file_map; -#line 5463 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5465 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = new_file; -#line 5463 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5465 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo; -#line 5463 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5465 "/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 41906 "Photo.c" +#line 41921 "Photo.c" } -#line 5464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->reverse_editable_file_map; -#line 5464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo; -#line 5464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = new_file; -#line 5464 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5466 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp13_, _tmp14_, _tmp15_); -#line 5453 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 41918 "Photo.c" +#line 41933 "Photo.c" } @@ -41935,29 +41950,29 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra LibraryPhoto* _tmp20_ = NULL; GeeCollection* _tmp21_ = NULL; GeeCollection* _tmp22_ = NULL; -#line 5467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5469 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self)); -#line 5467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5469 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (_photo)); -#line 5468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = _photo; -#line 5468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL); -#line 5468 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5470 "/home/jens/Source/shotwell/src/Photo.vala" photo = _tmp1_; -#line 5469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo; -#line 5469 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5471 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp2_ != NULL, "photo != null"); -#line 5472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->reverse_development_file_map; -#line 5472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo; -#line 5472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_); -#line 5472 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { -#line 41956 "Photo.c" +#line 41971 "Photo.c" GeeMultiMap* _tmp18_ = NULL; LibraryPhoto* _tmp19_ = NULL; { @@ -41968,25 +41983,25 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra GeeCollection* _tmp9_ = NULL; GeeIterator* _tmp10_ = NULL; GeeIterator* _tmp11_ = NULL; -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->reverse_development_file_map; -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = photo; -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_); -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = _tmp8_; -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = _tmp10_; -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp9_); -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp11_; -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41985 "Photo.c" +#line 42000 "Photo.c" GeeIterator* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; GFile* f = NULL; @@ -41994,68 +42009,68 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra gpointer _tmp15_ = NULL; GeeHashMap* _tmp16_ = NULL; GFile* _tmp17_ = NULL; -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _f_it; -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = gee_iterator_next (_tmp12_); -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp13_) { -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 42001 "Photo.c" +#line 42016 "Photo.c" } -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = _f_it; -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = gee_iterator_get (_tmp14_); -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp15_; -#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5476 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->development_file_map; -#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5476 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = f; -#line 5474 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5476 "/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 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 42017 "Photo.c" +#line 42032 "Photo.c" } -#line 5473 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 42021 "Photo.c" +#line 42036 "Photo.c" } -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5477 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = self->priv->reverse_development_file_map; -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5477 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = photo; -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5477 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_remove_all (_tmp18_, _tmp19_); -#line 42029 "Photo.c" +#line 42044 "Photo.c" } -#line 5479 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo; -#line 5479 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); -#line 5479 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" raw_list = _tmp21_; -#line 5480 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5482 "/home/jens/Source/shotwell/src/Photo.vala" _tmp22_ = raw_list; -#line 5480 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5482 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp22_ != NULL) { -#line 42041 "Photo.c" +#line 42056 "Photo.c" { GeeIterator* _f_it = NULL; GeeCollection* _tmp23_ = NULL; GeeIterator* _tmp24_ = NULL; -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = raw_list; -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" _f_it = _tmp24_; -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 42054 "Photo.c" +#line 42069 "Photo.c" GeeIterator* _tmp25_ = NULL; gboolean _tmp26_ = FALSE; GFile* f = NULL; @@ -42067,65 +42082,65 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra GeeMultiMap* _tmp32_ = NULL; LibraryPhoto* _tmp33_ = NULL; GFile* _tmp34_ = NULL; -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = _f_it; -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp26_ = gee_iterator_next (_tmp25_); -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp26_) { -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 42074 "Photo.c" +#line 42089 "Photo.c" } -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = _f_it; -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = gee_iterator_get (_tmp27_); -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" f = (GFile*) _tmp28_; -#line 5482 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5484 "/home/jens/Source/shotwell/src/Photo.vala" _tmp29_ = self->priv->development_file_map; -#line 5482 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5484 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = f; -#line 5482 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5484 "/home/jens/Source/shotwell/src/Photo.vala" _tmp31_ = photo; -#line 5482 "/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 (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_, _tmp31_); -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = self->priv->reverse_development_file_map; -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" _tmp33_ = photo; -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" _tmp34_ = f; -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" gee_multi_map_set (_tmp32_, _tmp33_, _tmp34_); -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 42100 "Photo.c" +#line 42115 "Photo.c" } -#line 5481 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 42104 "Photo.c" +#line 42119 "Photo.c" } } -#line 5467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5469 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_list); -#line 5467 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5469 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 42111 "Photo.c" +#line 42126 "Photo.c" } static void library_photo_source_holding_tank_class_init (LibraryPhotoSourceHoldingTankClass * klass) { -#line 5383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_parent_class = g_type_class_peek_parent (klass); -#line 5383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" ((SourceHoldingTankClass *) klass)->finalize = library_photo_source_holding_tank_finalize; -#line 5383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" g_type_class_add_private (klass, sizeof (LibraryPhotoSourceHoldingTankPrivate)); -#line 5383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" ((SourceHoldingTankClass *) klass)->notify_contents_altered = library_photo_source_holding_tank_real_notify_contents_altered; -#line 42124 "Photo.c" +#line 42139 "Photo.c" } @@ -42134,43 +42149,43 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH GeeHashMap* _tmp1_ = NULL; GeeHashMultiMap* _tmp2_ = NULL; GeeHashMultiMap* _tmp3_ = NULL; -#line 5383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE (self); -#line 5384 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5386 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); -#line 5384 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->editable_file_map = _tmp0_; #line 5386 "/home/jens/Source/shotwell/src/Photo.vala" + self->priv->editable_file_map = _tmp0_; +#line 5388 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, 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" - self->priv->development_file_map = _tmp1_; #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" + self->priv->development_file_map = _tmp1_; +#line 5390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, 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 5388 "/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 5390 "/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" _tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, 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 5392 "/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 42151 "Photo.c" +#line 42166 "Photo.c" } static void library_photo_source_holding_tank_finalize (SourceHoldingTank* obj) { LibraryPhotoSourceHoldingTank * self; -#line 5383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); -#line 5384 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (self->priv->editable_file_map); #line 5386 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (self->priv->development_file_map); + _g_object_unref0 (self->priv->editable_file_map); #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (self->priv->reverse_editable_file_map); + _g_object_unref0 (self->priv->development_file_map); #line 5390 "/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" _g_object_unref0 (self->priv->reverse_development_file_map); -#line 5383 "/home/jens/Source/shotwell/src/Photo.vala" +#line 5385 "/home/jens/Source/shotwell/src/Photo.vala" SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->finalize (obj); -#line 42169 "Photo.c" +#line 42184 "Photo.c" } -- cgit v1.2.3