diff options
Diffstat (limited to 'src/Photo.c')
| -rw-r--r-- | src/Photo.c | 30451 |
1 files changed, 15233 insertions, 15218 deletions
diff --git a/src/Photo.c b/src/Photo.c index c802450..3509b5d 100644 --- a/src/Photo.c +++ b/src/Photo.c @@ -1,4 +1,4 @@ -/* Photo.c generated by valac 0.36.6, the Vala compiler +/* Photo.c generated by valac 0.40.4, the Vala compiler * generated from Photo.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -14,6 +14,7 @@ /**/ /* In general, callers want to use the BASELINE unless requirements are specific.*/ + #include <glib.h> #include <glib-object.h> #include <gio/gio.h> @@ -86,10 +87,15 @@ typedef struct _PhotoTransformationState PhotoTransformationState; typedef struct _PhotoTransformationStateClass PhotoTransformationStateClass; typedef struct _PhotoTransformationStatePrivate PhotoTransformationStatePrivate; enum { + PHOTO_TRANSFORMATION_STATE_0_PROPERTY, + PHOTO_TRANSFORMATION_STATE_NUM_PROPERTIES +}; +static GParamSpec* photo_transformation_state_properties[PHOTO_TRANSFORMATION_STATE_NUM_PROPERTIES]; +enum { PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL, - PHOTO_TRANSFORMATION_STATE_LAST_SIGNAL + PHOTO_TRANSFORMATION_STATE_NUM_SIGNALS }; -static guint photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_LAST_SIGNAL] = {0}; +static guint photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_NUM_SIGNALS] = {0}; #define TYPE_RATING (rating_get_type ()) @@ -303,6 +309,11 @@ typedef struct _OneShotScheduler OneShotScheduler; typedef struct _OneShotSchedulerClass OneShotSchedulerClass; #define TYPE_RAW_DEVELOPER (raw_developer_get_type ()) +enum { + PHOTO_0_PROPERTY, + PHOTO_NUM_PROPERTIES +}; +static GParamSpec* photo_properties[PHOTO_NUM_PROPERTIES]; #define PHOTO_TYPE_CACHED_PIXBUF (photo_cached_pixbuf_get_type ()) #define PHOTO_CACHED_PIXBUF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PHOTO_TYPE_CACHED_PIXBUF, PhotoCachedPixbuf)) @@ -607,6 +618,11 @@ typedef struct _ConfigFacade ConfigFacade; typedef struct _ConfigFacadeClass ConfigFacadeClass; #define __g_list_free__g_object_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__g_object_unref0_ (var), NULL))) typedef struct _PhotoPhotoTransformationStateImplPrivate PhotoPhotoTransformationStateImplPrivate; +enum { + PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_0_PROPERTY, + PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_NUM_PROPERTIES +}; +static GParamSpec* photo_photo_transformation_state_impl_properties[PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_NUM_PROPERTIES]; typedef struct _PhotoParamSpecBackingReaders PhotoParamSpecBackingReaders; #define _g_timer_destroy0(var) ((var == NULL) ? NULL : (var = (g_timer_destroy (var), NULL))) typedef struct _PhotoParamSpecCachedPixbuf PhotoParamSpecCachedPixbuf; @@ -622,9 +638,9 @@ enum { PHOTO_EDITABLE_REIMPORTED_SIGNAL, PHOTO_BASELINE_REIMPORTED_SIGNAL, PHOTO_SOURCE_REIMPORTED_SIGNAL, - PHOTO_LAST_SIGNAL + PHOTO_NUM_SIGNALS }; -static guint photo_signals[PHOTO_LAST_SIGNAL] = {0}; +static guint photo_signals[PHOTO_NUM_SIGNALS] = {0}; typedef struct _DataCollectionPrivate DataCollectionPrivate; #define TYPE_MARKER (marker_get_type ()) @@ -788,9 +804,9 @@ enum { LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL, LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL, LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL, - LIBRARY_PHOTO_SOURCE_COLLECTION_LAST_SIGNAL + LIBRARY_PHOTO_SOURCE_COLLECTION_NUM_SIGNALS }; -static guint library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_LAST_SIGNAL] = {0}; +static guint library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_NUM_SIGNALS] = {0}; #define TYPE_FLAGGABLE (flaggable_get_type ()) #define FLAGGABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FLAGGABLE, Flaggable)) @@ -808,6 +824,11 @@ typedef struct _FlaggableIface FlaggableIface; typedef struct _Monitorable Monitorable; typedef struct _MonitorableIface MonitorableIface; typedef struct _LibraryPhotoPrivate LibraryPhotoPrivate; +enum { + LIBRARY_PHOTO_0_PROPERTY, + LIBRARY_PHOTO_NUM_PROPERTIES +}; +static GParamSpec* library_photo_properties[LIBRARY_PHOTO_NUM_PROPERTIES]; #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) #define THUMBNAIL_CACHE_TYPE_SIZE (thumbnail_cache_size_get_type ()) @@ -1745,9 +1766,15 @@ static gpointer library_photo_source_holding_tank_parent_class = NULL; GType backing_fetch_mode_get_type (void) G_GNUC_CONST; gpointer photo_import_params_ref (gpointer instance); void photo_import_params_unref (gpointer instance); -GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_import_params (GValue* value, gpointer v_object); -void value_take_photo_import_params (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_import_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_import_params (GValue* value, + gpointer v_object); +void value_take_photo_import_params (GValue* value, + gpointer v_object); gpointer value_get_photo_import_params (const GValue* value); GType photo_import_params_get_type (void) G_GNUC_CONST; GType import_id_get_type (void) G_GNUC_CONST; @@ -1756,33 +1783,57 @@ void import_id_free (ImportID* self); GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer thumbnails_ref (gpointer instance); void thumbnails_unref (gpointer instance); -GParamSpec* param_spec_thumbnails (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_thumbnails (GValue* value, gpointer v_object); -void value_take_thumbnails (GValue* value, gpointer v_object); +GParamSpec* param_spec_thumbnails (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_thumbnails (GValue* value, + gpointer v_object); +void value_take_thumbnails (GValue* value, + gpointer v_object); gpointer value_get_thumbnails (const GValue* value); GType thumbnails_get_type (void) G_GNUC_CONST; gpointer photo_row_ref (gpointer instance); void photo_row_unref (gpointer instance); -GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_row (GValue* value, gpointer v_object); -void value_take_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_row (GValue* value, + gpointer v_object); +void value_take_photo_row (GValue* value, + gpointer v_object); gpointer value_get_photo_row (const GValue* value); GType photo_row_get_type (void) G_GNUC_CONST; -enum { - PHOTO_IMPORT_PARAMS_DUMMY_PROPERTY -}; PhotoRow* photo_row_new (void); PhotoRow* photo_row_construct (GType object_type); -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); -PhotoImportParams* photo_import_params_construct (GType object_type, 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); -PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id); -PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, GFile* file, ImportID* import_id); +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); +PhotoImportParams* photo_import_params_construct (GType object_type, + 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); +PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, + ImportID* import_id); +PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, + GFile* file, + ImportID* import_id); static void photo_import_params_finalize (PhotoImportParams * obj); GType photo_transformation_state_get_type (void) G_GNUC_CONST; #define PHOTO_TRANSFORMATION_STATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationStatePrivate)) -enum { - PHOTO_TRANSFORMATION_STATE_DUMMY_PROPERTY -}; PhotoTransformationState* photo_transformation_state_construct (GType object_type); gboolean photo_transformation_state_is_broken (PhotoTransformationState* self); static void photo_transformation_state_real_broken (PhotoTransformationState* self); @@ -1798,32 +1849,56 @@ Rating rating_unserialize (gint value); GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; @@ -1835,9 +1910,15 @@ EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); gpointer backing_file_state_ref (gpointer instance); void backing_file_state_unref (gpointer instance); -GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_file_state (GValue* value, gpointer v_object); -void value_take_backing_file_state (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_file_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_file_state (GValue* value, + gpointer v_object); +void value_take_backing_file_state (GValue* value, + gpointer v_object); gpointer value_get_backing_file_state (const GValue* value); GType backing_file_state_get_type (void) G_GNUC_CONST; GType photo_exception_get_type (void) G_GNUC_CONST; @@ -1851,9 +1932,15 @@ void scaling_free (Scaling* self); GType photo_source_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -1862,37 +1949,60 @@ GType photo_get_type (void) G_GNUC_CONST; GType rotation_get_type (void) G_GNUC_CONST; gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; static gpointer photo_backing_readers_ref (gpointer instance); static void photo_backing_readers_unref (gpointer instance); -static GParamSpec* photo_param_spec_backing_readers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void photo_value_set_backing_readers (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void photo_value_take_backing_readers (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* photo_param_spec_backing_readers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void photo_value_set_backing_readers (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void photo_value_take_backing_readers (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer photo_value_get_backing_readers (const GValue* value) G_GNUC_UNUSED; static GType photo_backing_readers_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; gpointer one_shot_scheduler_ref (gpointer instance); void one_shot_scheduler_unref (gpointer instance); -GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_one_shot_scheduler (GValue* value, gpointer v_object); -void value_take_one_shot_scheduler (GValue* value, gpointer v_object); +GParamSpec* param_spec_one_shot_scheduler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_one_shot_scheduler (GValue* value, + gpointer v_object); +void value_take_one_shot_scheduler (GValue* value, + gpointer v_object); gpointer value_get_one_shot_scheduler (const GValue* value); GType one_shot_scheduler_get_type (void) G_GNUC_CONST; GType raw_developer_get_type (void) G_GNUC_CONST; #define PHOTO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO, PhotoPrivate)) -enum { - PHOTO_DUMMY_PROPERTY -}; -gboolean photo_exception_prohibits (PhotoException self, PhotoException exception); -gboolean photo_exception_allows (PhotoException self, PhotoException exception); +gboolean photo_exception_prohibits (PhotoException self, + PhotoException exception); +gboolean photo_exception_allows (PhotoException self, + PhotoException exception); static gpointer photo_cached_pixbuf_ref (gpointer instance); static void photo_cached_pixbuf_unref (gpointer instance); -static GParamSpec* photo_param_spec_cached_pixbuf (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void photo_value_set_cached_pixbuf (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void photo_value_take_cached_pixbuf (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* photo_param_spec_cached_pixbuf (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void photo_value_set_cached_pixbuf (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void photo_value_take_cached_pixbuf (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer photo_value_get_cached_pixbuf (const GValue* value) G_GNUC_UNUSED; static GType photo_cached_pixbuf_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; BackingPhotoRow* backing_photo_row_new (void); @@ -1905,9 +2015,11 @@ static PhotoBackingReaders* photo_backing_readers_construct (GType object_type); #define PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT 1 #define PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT 3 #define PHOTO_MIN_EMBEDDED_SIZE 1024 -Photo* photo_construct (GType object_type, PhotoRow* row); +Photo* photo_construct (GType object_type, + PhotoRow* row); #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) -PhotoSource* photo_source_construct (GType object_type, gint64 object_id); +PhotoSource* photo_source_construct (GType object_type, + gint64 object_id); gchar* media_source_prep_title (const gchar* title); GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); @@ -1919,135 +2031,265 @@ void backing_photo_id_free (BackingPhotoID* self); gchar* media_source_prep_comment (const gchar* comment); gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; -PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath); -gchar* string_sliced_at_last_char (const gchar* haystack, gunichar ch, gint start_index); -gchar* string_sliced_at (const gchar* str, gint index); +PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, + const gchar* filepath); +gchar* string_sliced_at_last_char (const gchar* haystack, + gunichar ch, + gint start_index); +gchar* string_sliced_at (const gchar* str, + gint index); gboolean is_string_empty (const gchar* s); #define BACKING_PHOTO_ID_INVALID ((gint64) -1) -static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id); +static BackingPhotoRow* photo_get_backing_row (Photo* self, + BackingPhotoID* id); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType photo_table_get_type (void) G_GNUC_CONST; PhotoTable* photo_table_get_instance (void); GQuark database_error_quark (void); -void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** error); -static void photo_internal_remove_all_transformations (Photo* self, gboolean notify); +void photo_table_detach_editable (PhotoTable* self, + PhotoRow* row, + GError** error); +static void photo_internal_remove_all_transformations (Photo* self, + gboolean notify); RawDeveloper* raw_developer_as_array (int* result_length1); void photo_init_photo (void); void photo_terminate_photo (void); -void photo_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_file); -static void photo_real_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_file); +void photo_notify_editable_replaced (Photo* self, + GFile* old_file, + GFile* new_file); +static void photo_real_notify_editable_replaced (Photo* self, + GFile* old_file, + GFile* new_file); void photo_notify_raw_development_modified (Photo* self); static void photo_real_notify_raw_development_modified (Photo* self); void photo_notify_baseline_replaced (Photo* self); static void photo_real_notify_baseline_replaced (Photo* self); -void photo_notify_master_reimported (Photo* self, PhotoMetadata* metadata); -static void photo_real_notify_master_reimported (Photo* self, PhotoMetadata* metadata); -void photo_notify_editable_reimported (Photo* self, PhotoMetadata* metadata); -static void photo_real_notify_editable_reimported (Photo* self, PhotoMetadata* metadata); -void photo_notify_source_reimported (Photo* self, PhotoMetadata* metadata); -static void photo_real_notify_source_reimported (Photo* self, PhotoMetadata* metadata); -void photo_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata); -static void photo_real_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata); -static gboolean photo_real_internal_delete_backing (DataSource* base, GError** error); +void photo_notify_master_reimported (Photo* self, + PhotoMetadata* metadata); +static void photo_real_notify_master_reimported (Photo* self, + PhotoMetadata* metadata); +void photo_notify_editable_reimported (Photo* self, + PhotoMetadata* metadata); +static void photo_real_notify_editable_reimported (Photo* self, + PhotoMetadata* metadata); +void photo_notify_source_reimported (Photo* self, + PhotoMetadata* metadata); +static void photo_real_notify_source_reimported (Photo* self, + PhotoMetadata* metadata); +void photo_notify_baseline_reimported (Photo* self, + PhotoMetadata* metadata); +static void photo_real_notify_baseline_reimported (Photo* self, + PhotoMetadata* metadata); +static gboolean photo_real_internal_delete_backing (DataSource* base, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); -static void photo_detach_editable (Photo* self, gboolean delete_editable, gboolean remove_transformations, gboolean notify); +static void photo_detach_editable (Photo* self, + gboolean delete_editable, + gboolean remove_transformations, + gboolean notify); PhotoFileFormat photo_get_master_file_format (Photo* self); -static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d); +static gboolean photo_delete_raw_development (Photo* self, + RawDeveloper d); gchar* data_object_to_string (DataObject* self); -gboolean data_source_internal_delete_backing (DataSource* self, GError** error); +gboolean data_source_internal_delete_backing (DataSource* self, + GError** error); GType backing_photo_table_get_type (void) G_GNUC_CONST; BackingPhotoTable* backing_photo_table_get_instance (void); -BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhotoID* id, GError** error); -void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backing_id, GError** error); -gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d); -gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d); -PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error); +BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, + BackingPhotoID* id, + GError** error); +void backing_photo_table_remove (BackingPhotoTable* self, + BackingPhotoID* backing_id, + GError** error); +gboolean photo_is_raw_developer_complete (Photo* self, + RawDeveloper d); +gboolean photo_is_raw_developer_available (Photo* self, + RawDeveloper d); +PhotoMetadata* photo_get_master_metadata (Photo* self, + GError** error); guint photo_metadata_get_preview_count (PhotoMetadata* self); gpointer photo_preview_ref (gpointer instance); void photo_preview_unref (gpointer instance); -GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_preview (GValue* value, gpointer v_object); -void value_take_photo_preview (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_preview (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_preview (GValue* value, + gpointer v_object); +void value_take_photo_preview (GValue* value, + gpointer v_object); gpointer value_get_photo_preview (const GValue* value); GType photo_preview_get_type (void) G_GNUC_CONST; -PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number); -void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result); -void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, gboolean notify, GError** error); -void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, BackingPhotoRow* bpr, GError** error); -void data_object_notify_altered (DataObject* self, Alteration* alteration); -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); +PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, + guint number); +void photo_preview_get_pixel_dimensions (PhotoPreview* self, + Dimensions* result); +void photo_add_backing_photo_for_development (Photo* self, + RawDeveloper d, + BackingPhotoRow* bpr, + gboolean notify, + GError** error); +void photo_import_developed_backing_photo (PhotoRow* row, + RawDeveloper d, + BackingPhotoRow* bpr, + GError** error); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); #define UTIL_FILE_ATTRIBUTES "standard::*,time::*,id::file,id::filesystem,etag::value" #define DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES UTIL_FILE_ATTRIBUTES gpointer photo_file_interrogator_ref (gpointer instance); void photo_file_interrogator_unref (gpointer instance); -GParamSpec* param_spec_photo_file_interrogator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_interrogator (GValue* value, gpointer v_object); -void value_take_photo_file_interrogator (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_interrogator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_interrogator (GValue* value, + gpointer v_object); +void value_take_photo_file_interrogator (GValue* value, + gpointer v_object); gpointer value_get_photo_file_interrogator (const GValue* value); GType photo_file_interrogator_get_type (void) G_GNUC_CONST; -PhotoFileInterrogator* photo_file_interrogator_new (GFile* file, PhotoFileSnifferOptions options); -PhotoFileInterrogator* photo_file_interrogator_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** error); +PhotoFileInterrogator* photo_file_interrogator_new (GFile* file, + PhotoFileSnifferOptions options); +PhotoFileInterrogator* photo_file_interrogator_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, + GError** error); gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; DetectedPhotoInformation* photo_file_interrogator_get_detected_photo_information (PhotoFileInterrogator* self); gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* self); Orientation photo_metadata_get_orientation (PhotoMetadata* self); -void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, GError** error); -void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error); -static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify); -BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error); -GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error); +void backing_photo_table_add (BackingPhotoTable* self, + BackingPhotoRow* state, + GError** error); +void photo_table_update_raw_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + BackingPhotoID* backing_photo_id, + GError** error); +static void photo_develop_photo (Photo* self, + RawDeveloper d, + gboolean notify); +BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, + const gchar* raw_filepath, + const gchar* camera_development_filename, + GError** error); +GdkPixbuf* photo_get_master_pixbuf (Photo* self, + Scaling* scaling, + gboolean rotate, + GError** error); void scaling_for_original (Scaling* result); GType photo_file_writer_get_type (void) G_GNUC_CONST; GQuark photo_format_error_quark (void); -PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gchar* filepath, GError** error); +PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error); GType jpeg_quality_get_type (void) G_GNUC_CONST; -void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); +void photo_file_writer_write (PhotoFileWriter* self, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; -PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error); -void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error); -GBytes* photo_preview_flatten (PhotoPreview* self, GError** error); -gboolean jpeg_is_jpeg_bytes (GBytes* bytes, GError** error); -GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error); -void photo_set_default_raw_developer (Photo* self, RawDeveloper d); -void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify); -void photo_revert_to_master (Photo* self, gboolean notify); -GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error); -gboolean photo_set_orientation (Photo* self, Orientation orientation); +PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error); +void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, + PhotoMetadata* metadata, + GError** error); +GBytes* photo_preview_flatten (PhotoPreview* self, + GError** error); +gboolean jpeg_is_jpeg_bytes (GBytes* bytes, + GError** error); +GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, + GError** error); +void photo_set_default_raw_developer (Photo* self, + RawDeveloper d); +void photo_set_raw_developer (Photo* self, + RawDeveloper d, + gboolean notify); +void photo_revert_to_master (Photo* self, + gboolean notify); +GdkPixbuf* photo_get_prefetched_copy (Photo* self, + GError** error); +gboolean photo_set_orientation (Photo* self, + Orientation orientation); void photo_discard_prefetched (Photo* self); RawDeveloper photo_get_raw_developer (Photo* self); gchar* raw_developer_to_string (RawDeveloper self); -void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, GError** error); -void photo_redevelop_raw (Photo* self, RawDeveloper d); -static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, int* result_length1); -BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, const gchar* md5); -BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, BackingPhotoRow* photo_row, const gchar* md5); -static void _vala_array_add89 (BackingFileState** * array, int* length, int* size, BackingFileState* value); +void photo_table_remove_development (PhotoTable* self, + PhotoRow* row, + RawDeveloper rd, + GError** error); +void photo_redevelop_raw (Photo* self, + RawDeveloper d); +static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, + int* result_length1); +BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, + const gchar* md5); +BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, + BackingPhotoRow* photo_row, + const gchar* md5); +static void _vala_array_add89 (BackingFileState** * array, + int* length, + int* size, + BackingFileState* value); gboolean photo_has_editable (Photo* self); -static void _vala_array_add90 (BackingFileState** * array, int* length, int* size, BackingFileState* value); +static void _vala_array_add90 (BackingFileState** * array, + int* length, + int* size, + BackingFileState* value); gboolean photo_is_developed (Photo* self); GeeCollection* photo_get_raw_development_photo_rows (Photo* self); -static void _vala_array_add91 (BackingFileState** * array, int* length, int* size, BackingFileState* value); -static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode); +static void _vala_array_add91 (BackingFileState** * array, + int* length, + int* size, + BackingFileState* value); +static PhotoFileReader* photo_get_backing_reader (Photo* self, + BackingFetchMode mode); static PhotoFileReader* photo_get_master_reader (Photo* self); static PhotoFileReader* photo_get_baseline_reader (Photo* self); static PhotoFileReader* photo_get_source_reader (Photo* self); @@ -2064,7 +2306,8 @@ gboolean photo_is_editable_source (Photo* self); BackingPhotoRow* photo_get_master_photo_row (Photo* self); BackingPhotoRow* photo_get_editable_photo_row (Photo* self); gboolean backing_photo_id_is_valid (BackingPhotoID *self); -BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper d); +BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, + RawDeveloper d); PhotoFileFormat* photo_get_editable_file_format (Photo* self); PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self); static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self); @@ -2072,194 +2315,432 @@ GType export_format_parameters_get_type (void) G_GNUC_CONST; GType export_format_mode_get_type (void) G_GNUC_CONST; ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self); void export_format_parameters_free (ExportFormatParameters* self); -PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params); +PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, + ExportFormatParameters* params); PhotoFileFormat photo_file_format_get_system_default_format (void); PhotoFileFormat photo_get_best_export_file_format (Photo* self); -gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params); +gchar* photo_get_export_basename_for_parameters (Photo* self, + ExportFormatParameters* params); GFile* media_source_get_master_file (MediaSource* self); -gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format); +gchar* photo_get_export_basename (Photo* self, + PhotoFileFormat* file_format); GType import_result_get_type (void) G_GNUC_CONST; ImportResult photo_prepare_for_import (PhotoImportParams* params); gboolean photo_is_file_image (GFile* file); gboolean photo_file_format_is_file_supported (GFile* file); gpointer metadata_date_time_ref (gpointer instance); void metadata_date_time_unref (gpointer instance); -GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_metadata_date_time (GValue* value, gpointer v_object); -void value_take_metadata_date_time (GValue* value, gpointer v_object); +GParamSpec* param_spec_metadata_date_time (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_metadata_date_time (GValue* value, + gpointer v_object); +void value_take_metadata_date_time (GValue* value, + gpointer v_object); gpointer value_get_metadata_date_time (const GValue* value); GType metadata_date_time_get_type (void) G_GNUC_CONST; MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self); time_t metadata_date_time_get_timestamp (MetadataDateTime* self); gchar* media_metadata_get_title (MediaMetadata* self); gchar* media_metadata_get_comment (MediaMetadata* self); -GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); +GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify); Rating photo_metadata_get_rating (PhotoMetadata* self); #define PHOTO_ID_INVALID ((gint64) -1) -void photo_id_init (PhotoID *self, gint64 id); +void photo_id_init (PhotoID *self, + gint64 id); #define EVENT_ID_INVALID ((gint64) -1) -void event_id_init (EventID *self, gint64 id); +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_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); -void dimensions_init (Dimensions *self, gint width, gint height); -BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoFileSnifferOptions options, DetectedPhotoInformation* * detected, GError** error); +void dimensions_init (Dimensions *self, + gint width, + gint height); +BackingPhotoRow* photo_query_backing_photo_row (Photo* self, + GFile* file, + PhotoFileSnifferOptions options, + DetectedPhotoInformation* * detected, + GError** error); gpointer photo_reimport_master_state_ref (gpointer instance); void photo_reimport_master_state_unref (gpointer instance); -GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void photo_value_set_reimport_master_state (GValue* value, gpointer v_object); -void photo_value_take_reimport_master_state (GValue* value, gpointer v_object); +GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void photo_value_set_reimport_master_state (GValue* value, + gpointer v_object); +void photo_value_take_reimport_master_state (GValue* value, + gpointer v_object); gpointer photo_value_get_reimport_master_state (const GValue* value); GType photo_reimport_master_state_get_type (void) G_GNUC_CONST; -gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error); -static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value); -static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1); -static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct (GType object_type, PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1); +gboolean photo_prepare_for_reimport_master (Photo* self, + PhotoReimportMasterState* * reimport_state, + GError** error); +static void _vala_array_add92 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add93 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add94 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add95 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add96 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add97 (gchar** * array, + int* length, + int* size, + gchar* value); +static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, + PhotoMetadata* metadata, + gchar** alterations, + int alterations_length1); +static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct (GType object_type, + PhotoRow* row, + PhotoMetadata* metadata, + gchar** alterations, + int alterations_length1); static GType photo_reimport_master_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -void photo_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata); -static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata); -void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error); -void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error); -void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from); -static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value); -Alteration* alteration_new_from_array (gchar** array, int array_length1); -Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1); -static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow* * backing, DetectedPhotoInformation* * detected, GError** error); +void photo_apply_user_metadata_for_reimport (Photo* self, + PhotoMetadata* metadata); +static void photo_real_apply_user_metadata_for_reimport (Photo* self, + PhotoMetadata* metadata); +void photo_finish_reimport_master (Photo* self, + PhotoReimportMasterState* state, + GError** error); +void photo_table_reimport (PhotoTable* self, + PhotoRow* row, + GError** error); +void backing_photo_row_copy_from (BackingPhotoRow* self, + BackingPhotoRow* from); +static void _vala_array_add98 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add99 (gchar** * array, + int* length, + int* size, + gchar* value); +Alteration* alteration_new_from_array (gchar** array, + int array_length1); +Alteration* alteration_construct_from_array (GType object_type, + gchar** array, + int array_length1); +static gboolean photo_verify_file_for_reimport (Photo* self, + GFile* file, + BackingPhotoRow* * backing, + DetectedPhotoInformation* * detected, + GError** error); gpointer photo_reimport_editable_state_ref (gpointer instance); void photo_reimport_editable_state_unref (gpointer instance); -GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object); -void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object); +GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void photo_value_set_reimport_editable_state (GValue* value, + gpointer v_object); +void photo_value_take_reimport_editable_state (GValue* value, + gpointer v_object); gpointer photo_value_get_reimport_editable_state (const GValue* value); GType photo_reimport_editable_state_get_type (void) G_GNUC_CONST; -gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState* * state, GError** error); +gboolean photo_prepare_for_reimport_editable (Photo* self, + PhotoReimportEditableState* * state, + GError** error); GFile* photo_get_editable_file (Photo* self); -static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata); -static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_construct (GType object_type, BackingPhotoRow* backing_state, PhotoMetadata* metadata); +static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, + PhotoMetadata* metadata); +static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_construct (GType object_type, + BackingPhotoRow* backing_state, + PhotoMetadata* metadata); static GType photo_reimport_editable_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* state, GError** error); -void photo_get_editable_id (Photo* self, BackingPhotoID* result); +void photo_finish_reimport_editable (Photo* self, + PhotoReimportEditableState* state, + GError** error); +void photo_get_editable_id (Photo* self, + BackingPhotoID* result); gboolean backing_photo_id_is_invalid (BackingPhotoID *self); -void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, GError** error); -void media_source_set_title (MediaSource* self, const gchar* title); -gboolean media_source_set_comment (MediaSource* self, const gchar* comment); -void media_source_set_rating (MediaSource* self, Rating rating); +void backing_photo_table_update (BackingPhotoTable* self, + BackingPhotoRow* row, + GError** error); +void media_source_set_title (MediaSource* self, + const gchar* title); +gboolean media_source_set_comment (MediaSource* self, + const gchar* comment); +void media_source_set_rating (MediaSource* self, + Rating rating); Alteration* alteration_new_from_list (const gchar* list); -Alteration* alteration_construct_from_list (GType object_type, const gchar* list); +Alteration* alteration_construct_from_list (GType object_type, + const gchar* list); gpointer photo_reimport_raw_development_state_ref (gpointer instance); void photo_reimport_raw_development_state_unref (gpointer instance); -GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_object); -void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object); +GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void photo_value_set_reimport_raw_development_state (GValue* value, + gpointer v_object); +void photo_value_take_reimport_raw_development_state (GValue* value, + gpointer v_object); gpointer photo_value_get_reimport_raw_development_state (const GValue* value); GType photo_reimport_raw_development_state_get_type (void) G_GNUC_CONST; -gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* * state, GError** error); +gboolean photo_prepare_for_reimport_raw_development (Photo* self, + PhotoReimportRawDevelopmentState* * state, + GError** error); GeeCollection* photo_get_raw_developer_files (Photo* self); static GType photo_reimport_raw_development_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void); static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_construct (GType object_type); -static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevelopmentStateImpl* self, BackingPhotoRow* backing, PhotoMetadata* metadata); +static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevelopmentStateImpl* self, + BackingPhotoRow* backing, + PhotoMetadata* metadata); static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRawDevelopmentStateImpl* self); -void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* state, GError** error); +void photo_finish_reimport_raw_development (Photo* self, + PhotoReimportRawDevelopmentState* state, + GError** error); static gpointer photo_reimport_raw_development_state_impl_dev_to_reimport_ref (gpointer instance); static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpointer instance); -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) G_GNUC_UNUSED; -static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, gpointer v_object) G_GNUC_UNUSED; +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) G_GNUC_UNUSED; +static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer photo_reimport_raw_development_state_impl_value_get_dev_to_reimport (const GValue* value) G_GNUC_UNUSED; GType photo_reimport_raw_development_state_impl_dev_to_reimport_get_type (void) G_GNUC_CONST; static gchar* photo_real_get_typename (DataSource* base); static gint64 photo_real_get_instance_id (DataSource* base); -void photo_get_photo_id (Photo* self, PhotoID* result); +void photo_get_photo_id (Photo* self, + PhotoID* result); static gchar* photo_real_get_source_id (DataSource* base); gchar* data_source_get_typename (DataSource* self); gint64 data_source_get_instance_id (DataSource* self); -void photo_set_master_timestamp (Photo* self, GFileInfo* info); -void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t timestamp, GError** error); +void photo_set_master_timestamp (Photo* self, + GFileInfo* info); +void photo_table_update_timestamp (PhotoTable* self, + PhotoID* photo_id, + time_t timestamp, + GError** error); void app_window_database_error (GError* err); -void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GError** error); -void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, GError** error); -void photo_update_many_editable_timestamps (GeeMap* map, GError** error); +void photo_update_editable_modification_time (Photo* self, + GFileInfo* info, + GError** error); +void backing_photo_table_update_timestamp (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + GError** error); +void photo_update_many_editable_timestamps (GeeMap* map, + GError** error); void database_table_begin_transaction (void); void database_table_commit_transaction (GError** error); static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSource* base); PhotoFileFormat photo_get_file_format (Photo* self); gboolean photo_file_format_can_write_image (PhotoFileFormat self); -static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error); -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); -void scaling_for_best_fit (gint pixels, gboolean scale_up, Scaling* result); -static gboolean photo_is_extension_found (const gchar* basename, gchar** extensions, int extensions_length1); -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); -gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format); -gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format); -PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, int* result_length1); -PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1); +static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); +GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); +void scaling_for_best_fit (gint pixels, + gboolean scale_up, + Scaling* result); +static gboolean photo_is_extension_found (const gchar* basename, + gchar** extensions, + int extensions_length1); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); +gboolean photo_is_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format); +gboolean photo_table_has_duplicate (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format); +PhotoID* photo_get_duplicate_ids (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format, + int* result_length1); +PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, + GFile* file, + const gchar* thumbnail_md5, + const gchar* md5, + PhotoFileFormat file_format, + int* result_length1); gint64 photo_get_photo_key (DataSource* source); GType library_photo_get_type (void) G_GNUC_CONST; static GFile* photo_real_get_file (MediaSource* base); -void photo_set_master_file (Photo* self, GFile* file); -void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error); -void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file); -static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value); -void photo_set_editable_file (Photo* self, GFile* file); -void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error); -static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value); -void photo_set_many_editable_file (GeeMap* map, GError** error); +void photo_set_master_file (Photo* self, + GFile* file); +void photo_table_set_filepath (PhotoTable* self, + PhotoID* photo_id, + const gchar* filepath, + GError** error); +void media_source_notify_master_replaced (MediaSource* self, + GFile* old_file, + GFile* new_file); +static void _vala_array_add100 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add101 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add102 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add103 (gchar** * array, + int* length, + int* size, + gchar* value); +void photo_set_editable_file (Photo* self, + GFile* file); +void backing_photo_table_set_filepath (BackingPhotoTable* self, + BackingPhotoID* id, + const gchar* filepath, + GError** error); +static void _vala_array_add104 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add105 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add106 (gchar** * array, + int* length, + int* size, + gchar* value); +void photo_set_many_editable_file (GeeMap* map, + GError** error); GFile* photo_get_actual_file (Photo* self); static GFile* photo_real_get_master_file (MediaSource* base); GFile* photo_get_source_file (Photo* self); gboolean photo_file_format_can_write (PhotoFileFormat self); static time_t photo_real_get_timestamp (MediaSource* base); -static inline void photo_real_get_event_id (MediaSource* base, EventID* result); +static inline void photo_real_get_event_id (MediaSource* base, + EventID* result); gint64 photo_get_raw_event_id (Photo* self); -static void photo_real_get_import_id (MediaSource* base, ImportID* result); +static void photo_real_get_import_id (MediaSource* base, + ImportID* result); static gchar* photo_real_get_master_md5 (MediaSource* base); guint64 photo_get_flags (Photo* self); -static void photo_notify_flags_altered (Photo* self, Alteration* additional_alteration); -Alteration* alteration_compress (Alteration* self, Alteration* other); -guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_alteration); -gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 flags); -gboolean photo_is_flag_set (Photo* self, guint64 mask); -gboolean media_source_internal_is_flag_set (guint64 flags, guint64 selector); -guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alteration); -guint64 media_source_internal_add_flags (guint64 flags, guint64 selector); -guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_alteration); -guint64 media_source_internal_remove_flags (guint64 flags, guint64 selector); -guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Alteration* additional_alteration); -void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alteration* additional_add_alteration, GeeCollection* remove, guint64 remove_mask, Alteration* additional_remove_alteration, GError** error); -guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_alteration); +static void photo_notify_flags_altered (Photo* self, + Alteration* additional_alteration); +Alteration* alteration_compress (Alteration* self, + Alteration* other); +guint64 photo_replace_flags (Photo* self, + guint64 flags, + Alteration* additional_alteration); +gboolean photo_table_replace_flags (PhotoTable* self, + PhotoID* photo_id, + guint64 flags); +gboolean photo_is_flag_set (Photo* self, + guint64 mask); +gboolean media_source_internal_is_flag_set (guint64 flags, + guint64 selector); +guint64 photo_add_flags (Photo* self, + guint64 mask, + Alteration* additional_alteration); +guint64 media_source_internal_add_flags (guint64 flags, + guint64 selector); +guint64 photo_remove_flags (Photo* self, + guint64 mask, + Alteration* additional_alteration); +guint64 media_source_internal_remove_flags (guint64 flags, + guint64 selector); +guint64 photo_add_remove_flags (Photo* self, + guint64 add, + guint64 remove, + Alteration* additional_alteration); +void photo_add_remove_many_flags (GeeCollection* add, + guint64 add_mask, + Alteration* additional_add_alteration, + GeeCollection* remove, + guint64 remove_mask, + Alteration* additional_remove_alteration, + GError** error); +guint64 photo_toggle_flags (Photo* self, + guint64 mask, + Alteration* additional_alteration); gboolean photo_is_master_metadata_dirty (Photo* self); -void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** error); -void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboolean dirty, GError** error); +void photo_set_master_metadata_dirty (Photo* self, + gboolean dirty, + GError** error); +void photo_table_set_metadata_dirty (PhotoTable* self, + PhotoID* photo_id, + gboolean dirty, + GError** error); static Rating photo_real_get_rating (MediaSource* base); -static void photo_real_set_rating (MediaSource* base, Rating rating); -gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rating); +static void photo_real_set_rating (MediaSource* base, + Rating rating); +gboolean photo_table_set_rating (PhotoTable* self, + PhotoID* photo_id, + Rating rating); static void photo_real_increase_rating (MediaSource* base); static void photo_real_decrease_rating (MediaSource* base); -static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks); -void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gchar* backlinks, GError** error); -static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id); -gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* event_id); +static void photo_real_commit_backlinks (DataSource* base, + SourceCollection* sources, + const gchar* backlinks); +void photo_table_update_backlinks (PhotoTable* self, + PhotoID* photo_id, + const gchar* backlinks, + GError** error); +static gboolean photo_real_set_event_id (MediaSource* base, + EventID* event_id); +gboolean photo_table_set_event (PhotoTable* self, + PhotoID* photo_id, + EventID* event_id); static gchar* photo_real_to_string (DataObject* base); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); -static gboolean photo_real_equals (DataSource* base, DataSource* source); -gboolean data_source_equals (DataSource* self, DataSource* source); +static gboolean photo_real_equals (DataSource* base, + DataSource* source); +gboolean data_source_equals (DataSource* self, + DataSource* source); static void photo_file_exif_updated (Photo* self); GFile* media_source_get_file (MediaSource* self); -gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gint64 filesize, glong timestamp, const gchar* md5, const gchar* exif_md5, const gchar* thumbnail_md5, PhotoRow* row); +gboolean photo_table_master_exif_updated (PhotoTable* self, + PhotoID* photoID, + gint64 filesize, + glong timestamp, + const gchar* md5, + const gchar* exif_md5, + const gchar* thumbnail_md5, + PhotoRow* row); static guint64 photo_real_get_filesize (MediaSource* base); static guint64 photo_real_get_master_filesize (MediaSource* base); guint64 photo_get_editable_filesize (Photo* self); @@ -2267,55 +2748,113 @@ static time_t photo_real_get_exposure_time (Dateable* base); static gchar* photo_real_get_basename (MediaSource* base); static gchar* photo_real_get_title (MediaSource* base); static gchar* photo_real_get_comment (MediaSource* base); -static void photo_real_set_title (MediaSource* base, const gchar* title); -gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar* new_title); -static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment); -gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gchar* new_comment); -void photo_set_import_id (Photo* self, ImportID* import_id); -void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* import_id, GError** error); -void photo_set_title_persistent (Photo* self, const gchar* title, GError** error); +static void photo_real_set_title (MediaSource* base, + const gchar* title); +gboolean photo_table_set_title (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_title); +static gboolean photo_real_set_comment (MediaSource* base, + const gchar* comment); +gboolean photo_table_set_comment (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_comment); +void photo_set_import_id (Photo* self, + ImportID* import_id); +void photo_table_set_import_id (PhotoTable* self, + PhotoID* photo_id, + ImportID* import_id, + GError** error); +void photo_set_title_persistent (Photo* self, + const gchar* title, + GError** error); gboolean photo_file_format_can_write_metadata (PhotoFileFormat self); -PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error); +PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, + GError** error); GType photo_metadata_set_option_get_type (void) G_GNUC_CONST; -void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option); -PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, GError** error); -void library_monitor_blacklist_file (GFile* file, const gchar* reason); +void photo_metadata_set_title (PhotoMetadata* self, + const gchar* title, + PhotoMetadataSetOption option); +PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, + GError** error); +void library_monitor_blacklist_file (GFile* file, + const gchar* reason); void library_monitor_unblacklist_file (GFile* file); -void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** error); -void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option); -static void photo_real_set_exposure_time (Dateable* base, time_t time); -gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, time_t time); -void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** error); -void dateable_set_exposure_time (Dateable* self, time_t target_time); -void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option); +void photo_set_comment_persistent (Photo* self, + const gchar* comment, + GError** error); +void photo_metadata_set_comment (PhotoMetadata* self, + const gchar* comment, + PhotoMetadataSetOption option); +static void photo_real_set_exposure_time (Dateable* base, + time_t time); +gboolean photo_table_set_exposure_time (PhotoTable* self, + PhotoID* photo_id, + time_t time); +void photo_set_exposure_time_persistent (Photo* self, + time_t time, + GError** error); +void dateable_set_exposure_time (Dateable* self, + time_t target_time); +void photo_metadata_set_exposure_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option); MetadataDateTime* metadata_date_time_new (time_t timestamp); -MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp); -static void photo_real_get_dimensions (MediaSource* base, PhotoException disallowed_steps, Dimensions* result); -void photo_get_raw_dimensions (Photo* self, Dimensions* result); +MetadataDateTime* metadata_date_time_construct (GType object_type, + time_t timestamp); +static void photo_real_get_dimensions (MediaSource* base, + PhotoException disallowed_steps, + Dimensions* result); +void photo_get_raw_dimensions (Photo* self, + Dimensions* result); Orientation photo_get_orientation (Photo* self); -gboolean photo_get_straighten (Photo* self, gdouble* theta); -void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble angle, gdouble* dest_width, gdouble* dest_height); +gboolean photo_get_straighten (Photo* self, + gdouble* theta); +void compute_arb_rotated_size (gdouble src_width, + gdouble src_height, + gdouble angle, + gdouble* dest_width, + gdouble* dest_height); GType box_get_type (void) G_GNUC_CONST; Box* box_dup (const Box* self); void box_free (Box* self); -gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions); -void box_get_dimensions (Box *self, Dimensions* result); +gboolean photo_get_crop (Photo* self, + Box* crop, + PhotoException exceptions); +void box_get_dimensions (Box *self, + Dimensions* result); static void photo_locked_create_adjustments_from_data (Photo* self); -static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name); +static KeyValueMap* photo_get_transformation (Photo* self, + const gchar* name); PixelTransformationBundle* photo_get_color_adjustments (Photo* self); PixelTransformer* photo_get_pixel_transformer (Photo* self); gboolean photo_has_color_adjustments (Photo* self); -static gboolean photo_has_transformation (Photo* self, const gchar* name); -PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformationType type); -void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_adjustments); -static gboolean photo_remove_transformation (Photo* self, const gchar* name); -static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans); +static gboolean photo_has_transformation (Photo* self, + const gchar* name); +PixelTransformation* photo_get_color_adjustment (Photo* self, + PixelTransformationType type); +void photo_set_color_adjustments (Photo* self, + PixelTransformationBundle* new_adjustments); +static gboolean photo_remove_transformation (Photo* self, + const gchar* name); +static gboolean photo_set_transformation (Photo* self, + KeyValueMap* trans); static PhotoMetadata* photo_real_get_metadata (PhotoSource* base); -PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error); -gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState* * state, GError** error); -void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error); -gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState* * state, GError** error); -void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error); +PhotoMetadata* photo_get_editable_metadata (Photo* self, + GError** error); +gboolean photo_persist_master_metadata (Photo* self, + PhotoMetadata* metadata, + PhotoReimportMasterState* * state, + GError** error); +void photo_finish_update_master_metadata (Photo* self, + PhotoReimportMasterState* state, + GError** error); +gboolean photo_persist_editable_metadata (Photo* self, + PhotoMetadata* metadata, + PhotoReimportEditableState* * state, + GError** error); +void photo_finish_update_editable_metadata (Photo* self, + PhotoReimportEditableState* state, + GError** error); gboolean photo_has_transformations (Photo* self); gboolean photo_only_metadata_changed (Photo* self); PhotoMetadata* photo_source_get_metadata (PhotoSource* self); @@ -2323,217 +2862,415 @@ gboolean photo_has_alterations (Photo* self); gchar* media_source_get_comment (MediaSource* self); gchar* media_source_get_title (MediaSource* self); PhotoTransformationState* photo_save_transformation_state (Photo* self); -static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_new (Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments); -static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_construct (GType object_type, Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments); +static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_new (Photo* photo, + Orientation orientation, + GeeHashMap* transformations, + PixelTransformer* transformer, + PixelTransformationBundle* adjustments); +static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_construct (GType object_type, + Photo* photo, + Orientation orientation, + GeeHashMap* transformations, + PixelTransformer* transformer, + PixelTransformationBundle* adjustments); static GType photo_photo_transformation_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* state); +gboolean photo_load_transformation_state (Photo* self, + PhotoTransformationState* state); static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoPhotoTransformationStateImpl* self); static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (PhotoPhotoTransformationStateImpl* self); static PixelTransformer* photo_photo_transformation_state_impl_get_transformer (PhotoPhotoTransformationStateImpl* self); static PixelTransformationBundle* photo_photo_transformation_state_impl_get_color_adjustments (PhotoPhotoTransformationStateImpl* self); -gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_id, Orientation orientation, GeeHashMap* transformations); +gboolean photo_table_set_transformation_state (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation, + GeeHashMap* transformations); void photo_remove_all_transformations (Photo* self); -gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* photo_id); -gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orientation orientation); +gboolean photo_table_remove_all_transformations (PhotoTable* self, + PhotoID* photo_id); +gboolean photo_table_set_orientation (PhotoTable* self, + PhotoID* photo_id, + Orientation orientation); Orientation photo_get_original_orientation (Photo* self); gboolean photo_check_can_rotate (Photo* self); -void photo_rotate (Photo* self, Rotation rotation); -static void photo_real_rotate (Photo* self, Rotation rotation); -Orientation orientation_perform (Orientation self, Rotation rotation); -gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map); -gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object); +void photo_rotate (Photo* self, + Rotation rotation); +static void photo_real_rotate (Photo* self, + Rotation rotation); +Orientation orientation_perform (Orientation self, + Rotation rotation); +gboolean photo_table_set_transformation (PhotoTable* self, + PhotoID* photo_id, + KeyValueMap* map); +gboolean photo_table_remove_transformation (PhotoTable* self, + PhotoID* photo_id, + const gchar* object); gboolean photo_has_crop (Photo* self); -gboolean photo_get_raw_crop (Photo* self, Box* crop); -void box_init (Box *self, gint left, gint top, gint right, gint bottom); -static void photo_set_raw_crop (Photo* self, Box* crop); -static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle); -static void photo_set_raw_straighten (Photo* self, gdouble theta); +gboolean photo_get_raw_crop (Photo* self, + Box* crop); +void box_init (Box *self, + gint left, + gint top, + gint right, + gint bottom); +static void photo_set_raw_crop (Photo* self, + Box* crop); +static gboolean photo_get_raw_straighten (Photo* self, + gdouble* angle); +static void photo_set_raw_straighten (Photo* self, + gdouble theta); GType editing_tools_redeye_instance_get_type (void) G_GNUC_CONST; EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self); void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self); -static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, int* result_length1); +static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, + int* result_length1); gboolean photo_has_redeye_transformations (Photo* self); -void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye); -static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling, PhotoException exceptions, Dimensions* scaled_image, Dimensions* scaled_to_viewport); -static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling, PhotoException exceptions, Dimensions* scaled_image, Dimensions* scaled_to_viewport); +void photo_add_redeye_instance (Photo* self, + EditingToolsRedeyeInstance* redeye); +static gboolean photo_calculate_pixbuf_dimensions (Photo* self, + Scaling* scaling, + PhotoException exceptions, + Dimensions* scaled_image, + Dimensions* scaled_to_viewport); +static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, + Scaling* scaling, + PhotoException exceptions, + Dimensions* scaled_image, + Dimensions* scaled_to_viewport); gboolean scaling_is_unscaled (Scaling *self); -void orientation_rotate_box (Orientation self, Dimensions* space, Box* box, Box* result); -void orientation_rotate_dimensions (Orientation self, Dimensions* dim, Dimensions* result); -void box_get_scaled (Box *self, Dimensions* scaled, Box* result); -void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensions* result); +void orientation_rotate_box (Orientation self, + Dimensions* space, + Box* box, + Box* result); +void orientation_rotate_dimensions (Orientation self, + Dimensions* dim, + Dimensions* result); +void box_get_scaled (Box *self, + Dimensions* scaled, + Box* result); +void scaling_get_scaled_dimensions (Scaling *self, + Dimensions* original, + Dimensions* result); gint box_get_width (Box *self); gint box_get_height (Box *self); -void dimensions_get_scaled_similar (Dimensions *self, Dimensions* original, Dimensions* scaled, Dimensions* result); -void orientation_derotate_dimensions (Orientation self, Dimensions* dim, Dimensions* result); +void dimensions_get_scaled_similar (Dimensions *self, + Dimensions* original, + Dimensions* scaled, + Dimensions* result); +void orientation_derotate_dimensions (Orientation self, + Dimensions* dim, + Dimensions* result); gboolean dimensions_has_area (Dimensions *self); -static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error); -GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** error); -GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error); -gboolean dimensions_approx_equals (Dimensions *self, Dimensions* dim, gint fudge); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); -static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, BackingFetchMode fetch_mode, GError** error); -GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error); -GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf); -static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GError** error); -GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error); -static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, GError** error); -static PhotoCachedPixbuf* photo_cached_pixbuf_new (Photo* photo, GdkPixbuf* pixbuf); -static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Photo* photo, GdkPixbuf* pixbuf); +static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error); +GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, + GError** error); +GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, + Dimensions* full, + Dimensions* scaled, + GError** error); +gboolean dimensions_approx_equals (Dimensions *self, + Dimensions* dim, + gint fudge); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); +static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, + Scaling* scaling, + gboolean rotate, + BackingFetchMode fetch_mode, + GError** error); +GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, + Scaling* scaling, + gboolean rotate, + GError** error); +GdkPixbuf* orientation_rotate_pixbuf (Orientation self, + GdkPixbuf* pixbuf); +static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, + Scaling* scaling, + GError** error); +GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error); +static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, + gboolean keep, + GError** error); +static PhotoCachedPixbuf* photo_cached_pixbuf_new (Photo* photo, + GdkPixbuf* pixbuf); +static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, + Photo* photo, + GdkPixbuf* pixbuf); static gboolean photo_trim_source_pixbuf_cache (void); static gboolean _photo_trim_source_pixbuf_cache_gsource_func (gpointer self); gboolean photo_get_develop_raw_photos_to_files (void); -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); -gboolean dimensions_equals (Dimensions *self, Dimensions* dim); -static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsRedeyeInstance* inst); -GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); +gboolean dimensions_equals (Dimensions *self, + Dimensions* dim); +static GdkPixbuf* photo_do_redeye (Photo* self, + GdkPixbuf* pixbuf, + EditingToolsRedeyeInstance* inst); +GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, + gdouble angle); gboolean photo_has_user_generated_metadata (Photo* self); static gboolean photo_real_has_user_generated_metadata (Photo* self); -void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata); -static void photo_real_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata); +void photo_set_user_metadata_for_export (Photo* self, + PhotoMetadata* metadata); +static void photo_real_set_user_metadata_for_export (Photo* self, + PhotoMetadata* metadata); gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self); -GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, GFile* file); -static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboolean export_metadata, GError** error); +GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, + GFile* file); +static gboolean photo_export_fullsized_backing (Photo* self, + GFile* file, + gboolean export_metadata, + GError** error); PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self); time_t media_source_get_exposure_time (MediaSource* self); -void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, PhotoMetadataSetOption option); -void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation); -void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, const gchar* version); +void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, + Dimensions* dim, + PhotoMetadataSetOption option); +void photo_metadata_set_orientation (PhotoMetadata* self, + Orientation orientation); +void photo_metadata_set_software (PhotoMetadata* self, + const gchar* software, + const gchar* version); #define RESOURCES_APP_TITLE "Shotwell" #define RESOURCES_APP_VERSION _VERSION void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self); void photo_metadata_clear (PhotoMetadata* self); -gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileFormat export_format); -void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error); +gboolean photo_is_export_required (Photo* self, + Scaling* scaling, + PhotoFileFormat export_format); +void photo_export (Photo* self, + GFile* dest_file, + Scaling* scaling, + JpegQuality quality, + PhotoFileFormat export_format, + gboolean direct_copy_unmodified, + gboolean export_metadata, + GError** error); const gchar* photo_file_format_to_string (PhotoFileFormat self); -void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag); -static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* file_format, GError** error); -gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext); +void photo_metadata_remove_tag (PhotoMetadata* self, + const gchar* tag); +static GFile* photo_generate_new_editable_file (Photo* self, + PhotoFileFormat* file_format, + GError** error); +gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, + const gchar* ext); gchar* photo_file_format_properties_get_default_extension (PhotoFileFormatProperties* self); -GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error); -static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, GError** error); +GFile* generate_unique_file (GFile* dir, + const gchar* basename, + gboolean* collision, + GError** error); +static gboolean photo_launch_editor (GFile* file, + PhotoFileFormat file_format, + GError** error); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self); gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self); static void _g_object_unref0_ (gpointer var); -static void _g_list_free__g_object_unref0_ (GList* self); -void photo_open_with_raw_external_editor (Photo* self, GError** error); -void photo_open_with_external_editor (Photo* self, GError** error); +static inline void _g_list_free__g_object_unref0_ (GList* self); +void photo_open_with_raw_external_editor (Photo* self, + GError** error); +void photo_open_with_external_editor (Photo* self, + GError** error); static void photo_halt_monitoring_editable (Photo* self); -static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFile* file, GError** error); -static void photo_start_monitoring_editable (Photo* self, GFile* file, GError** error); -static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* other_file, GFileMonitorEvent event); -static void _photo_on_editable_file_changed_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self); -static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoFileReader* new_reader, GError** error); -static void photo_update_editable_attributes (Photo* self, GError** error); -void photo_reimport_editable (Photo* self, GError** error); -void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error); -void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error); -static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add109 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add110 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add111 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add112 (gchar** * array, int* length, int* size, gchar* value); -void backing_photo_id_init (BackingPhotoID *self, gint64 id); +static void photo_attach_editable (Photo* self, + PhotoFileFormat file_format, + GFile* file, + GError** error); +static void photo_start_monitoring_editable (Photo* self, + GFile* file, + GError** error); +static void photo_on_editable_file_changed (Photo* self, + GFile* file, + GFile* other_file, + GFileMonitorEvent event); +static void _photo_on_editable_file_changed_g_file_monitor_changed (GFileMonitor* _sender, + GFile* file, + GFile* other_file, + GFileMonitorEvent event_type, + gpointer self); +static void photo_update_editable (Photo* self, + gboolean only_attributes, + PhotoFileReader* new_reader, + GError** error); +static void photo_update_editable_attributes (Photo* self, + GError** error); +void photo_reimport_editable (Photo* self, + GError** error); +void photo_table_attach_editable (PhotoTable* self, + PhotoRow* row, + BackingPhotoID* editable_id, + GError** error); +void backing_photo_table_update_attributes (BackingPhotoTable* self, + BackingPhotoID* id, + time_t timestamp, + gint64 filesize, + GError** error); +static void _vala_array_add107 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add108 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add109 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add110 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add111 (gchar** * array, + int* length, + int* size, + gchar* value); +static void _vala_array_add112 (gchar** * array, + int* length, + int* size, + gchar* value); +void backing_photo_id_init (BackingPhotoID *self, + gint64 id); const gchar* g_file_monitor_event_to_string (GFileMonitorEvent self); static void photo_on_reimport_editable (Photo* self); static void _photo_on_reimport_editable_one_shot_callback (gpointer self); -OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target); -OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target); -void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule); +OneShotScheduler* one_shot_scheduler_new (const gchar* name, + OneShotCallback callback, + void* callback_target); +OneShotScheduler* one_shot_scheduler_construct (GType object_type, + const gchar* name, + OneShotCallback callback, + void* callback_target); +void one_shot_scheduler_after_timeout (OneShotScheduler* self, + guint msec, + gboolean reschedule); static void photo_on_update_editable_attributes (Photo* self); static void _photo_on_update_editable_attributes_one_shot_callback (gpointer self); static void photo_on_remove_editable (Photo* self); static void _photo_on_remove_editable_one_shot_callback (gpointer self); -void photo_get_original_dimensions (Photo* self, Dimensions* result); -void photo_get_master_dimensions (Photo* self, Dimensions* result); -void photo_set_crop (Photo* self, Box* crop); -void orientation_derotate_box (Orientation self, Dimensions* space, Box* box, Box* result); -void photo_set_straighten (Photo* self, gdouble theta); -static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x, gint y); -void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoint* result); -void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint* point, GdkPoint* result); -void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRectangle* result); +void photo_get_original_dimensions (Photo* self, + Dimensions* result); +void photo_get_master_dimensions (Photo* self, + Dimensions* result); +void photo_set_crop (Photo* self, + Box* crop); +void orientation_derotate_box (Orientation self, + Dimensions* space, + Box* box, + Box* result); +void photo_set_straighten (Photo* self, + gdouble theta); +static GdkPixbuf* photo_red_reduce_pixel (Photo* self, + GdkPixbuf* pixbuf, + gint x, + gint y); +void photo_unscaled_to_raw_point (Photo* self, + GdkPoint* unscaled_point, + GdkPoint* result); +void orientation_derotate_point (Orientation self, + Dimensions* space, + GdkPoint* point, + GdkPoint* result); +void photo_unscaled_to_raw_rect (Photo* self, + GdkRectangle* unscaled_rect, + GdkRectangle* result); PixelTransformationBundle* photo_get_enhance_transformations (Photo* self); gboolean photo_enhance (Photo* self); void photo_set_develop_raw_photos_to_files (gboolean value); -static void photo_real_editable_replaced (Photo* self, GFile* old_file, GFile* new_file); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +static void photo_real_editable_replaced (Photo* self, + GFile* old_file, + GFile* new_file); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void photo_real_raw_development_modified (Photo* self); static void photo_real_baseline_replaced (Photo* self); -static void photo_real_master_reimported (Photo* self, PhotoMetadata* metadata); -static void g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void photo_real_editable_reimported (Photo* self, PhotoMetadata* metadata); -static void photo_real_baseline_reimported (Photo* self, PhotoMetadata* metadata); -static void photo_real_source_reimported (Photo* self, PhotoMetadata* metadata); +static void photo_real_master_reimported (Photo* self, + PhotoMetadata* metadata); +static void g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void photo_real_editable_reimported (Photo* self, + PhotoMetadata* metadata); +static void photo_real_baseline_reimported (Photo* self, + PhotoMetadata* metadata); +static void photo_real_source_reimported (Photo* self, + PhotoMetadata* metadata); #define PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL, PhotoPhotoTransformationStateImplPrivate)) -enum { - PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_DUMMY_PROPERTY -}; static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (PhotoPhotoTransformationStateImpl* self); -static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, gpointer self); +static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, + gpointer self); static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (GeeHashMap* original); static void photo_photo_transformation_state_impl_finalize (GObject * obj); -enum { - PHOTO_BACKING_READERS_DUMMY_PROPERTY -}; static void photo_backing_readers_finalize (PhotoBackingReaders * obj); -enum { - PHOTO_CACHED_PIXBUF_DUMMY_PROPERTY -}; static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf * obj); -enum { - PHOTO_REIMPORT_MASTER_STATE_DUMMY_PROPERTY -}; PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_type); static void photo_reimport_master_state_finalize (PhotoReimportMasterState * obj); -enum { - PHOTO_REIMPORT_MASTER_STATE_IMPL_DUMMY_PROPERTY -}; -static gchar** _vala_array_dup24 (gchar** self, int length); +static gchar** _vala_array_dup24 (gchar** self, + int length); static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj); -enum { - PHOTO_REIMPORT_EDITABLE_STATE_DUMMY_PROPERTY -}; PhotoReimportEditableState* photo_reimport_editable_state_construct (GType object_type); static void photo_reimport_editable_state_finalize (PhotoReimportEditableState * obj); -enum { - PHOTO_REIMPORT_EDITABLE_STATE_IMPL_DUMMY_PROPERTY -}; static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState * obj); -enum { - PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_DUMMY_PROPERTY -}; PhotoReimportRawDevelopmentState* photo_reimport_raw_development_state_construct (GType object_type); static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState * obj); -enum { - PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DUMMY_PROPERTY -}; -static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, PhotoMetadata* metadata); -static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_construct (GType object_type, BackingPhotoRow* backing, PhotoMetadata* metadata); -enum { - PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_DUMMY_PROPERTY -}; +static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, + PhotoMetadata* metadata); +static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_construct (GType object_type, + BackingPhotoRow* backing, + PhotoMetadata* metadata); static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport * obj); static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState * obj); static void photo_finalize (GObject * obj); -static void _vala_photo_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_photo_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_photo_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_photo_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); GType marker_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; @@ -2542,75 +3279,154 @@ GType database_source_holding_tank_get_type (void) G_GNUC_CONST; GType media_source_holding_tank_get_type (void) G_GNUC_CONST; gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); -GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; GType media_monitor_get_type (void) G_GNUC_CONST; gpointer transaction_controller_ref (gpointer instance); void transaction_controller_unref (gpointer instance); -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transaction_controller (GValue* value, gpointer v_object); -void value_take_transaction_controller (GValue* value, gpointer v_object); +GParamSpec* param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transaction_controller (GValue* value, + gpointer v_object); +void value_take_transaction_controller (GValue* value, + gpointer v_object); gpointer value_get_transaction_controller (const GValue* value); GType transaction_controller_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; #define LIBRARY_PHOTO_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollectionPrivate)) -enum { - LIBRARY_PHOTO_SOURCE_COLLECTION_DUMMY_PROPERTY -}; GType library_photo_source_collection_state_get_type (void) G_GNUC_CONST; guint file_hash (GFile* file); -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean file_equal (GFile* a, GFile* b); -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); -gint int64_compare (gint64* a, gint64* b); -static gint _int64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _file_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean file_equal (GFile* a, + GFile* b); +static gboolean _file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +gint int64_compare (gint64* a, + gint64* b); +static gint _int64_compare_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); static gint64* _int64_dup (gint64* self); -gboolean int64_equal (gint64* a, gint64* b); -static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +gboolean int64_equal (gint64* a, + gint64* b); +static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); LibraryPhotoSourceCollection* library_photo_source_collection_new (void); LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType object_type); -static gint64 _photo_get_photo_key_get_source_database_key (DataSource* source, gpointer self); -MediaSourceCollection* media_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); +static gint64 _photo_get_photo_key_get_source_database_key (DataSource* source, + gpointer self); +MediaSourceCollection* media_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollection* self); -static void library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed); -static void _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self); +static void library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, + GeeCollection* added, + GeeCollection* removed); +static void _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self); MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceCollection* self); -static void library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed); -static void _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self); +static void library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, + GeeCollection* added, + GeeCollection* removed); +static void _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self); static MediaSourceHoldingTank* library_photo_source_collection_real_create_trashcan (MediaSourceCollection* base); -static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryPhotoSourceCollection* self, DataSource* source, Alteration* alteration); -static gboolean _library_photo_source_collection_check_if_trashed_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self); -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); -LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GType object_type, LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); +static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryPhotoSourceCollection* self, + DataSource* source, + Alteration* alteration); +static gboolean _library_photo_source_collection_check_if_trashed_photo_source_holding_tank_check_to_keep (DataSource* source, + Alteration* alteration, + gpointer self); +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); +LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GType object_type, + LibraryPhotoSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); GType library_photo_source_holding_tank_get_type (void) G_GNUC_CONST; static MediaSourceHoldingTank* library_photo_source_collection_real_create_offline_bin (MediaSourceCollection* base); -static gboolean library_photo_source_collection_check_if_offline_photo (LibraryPhotoSourceCollection* self, DataSource* source, Alteration* alteration); -static gboolean _library_photo_source_collection_check_if_offline_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self); -static MediaMonitor* library_photo_source_collection_real_create_media_monitor (MediaSourceCollection* base, Workers* workers, GCancellable* cancellable); -PhotoMonitor* photo_monitor_new (Workers* workers, GCancellable* cancellable); -PhotoMonitor* photo_monitor_construct (GType object_type, Workers* workers, GCancellable* cancellable); +static gboolean library_photo_source_collection_check_if_offline_photo (LibraryPhotoSourceCollection* self, + DataSource* source, + Alteration* alteration); +static gboolean _library_photo_source_collection_check_if_offline_photo_source_holding_tank_check_to_keep (DataSource* source, + Alteration* alteration, + gpointer self); +static MediaMonitor* library_photo_source_collection_real_create_media_monitor (MediaSourceCollection* base, + Workers* workers, + GCancellable* cancellable); +PhotoMonitor* photo_monitor_new (Workers* workers, + GCancellable* cancellable); +PhotoMonitor* photo_monitor_construct (GType object_type, + Workers* workers, + GCancellable* cancellable); GType photo_monitor_get_type (void) G_GNUC_CONST; -static gboolean library_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source); +static gboolean library_photo_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source); static gchar* library_photo_source_collection_real_get_typename (MediaSourceCollection* base); -static gboolean library_photo_source_collection_real_is_file_recognized (MediaSourceCollection* base, GFile* file); -static void library_photo_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed); -static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, Photo* photo, GFile* old_file, GFile* new_file); -static void _library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self); -static void library_photo_source_collection_on_raw_development_modified (LibraryPhotoSourceCollection* self, Photo* _photo); -static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self); -void data_collection_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed); -static void library_photo_source_collection_real_items_altered (DataCollection* base, GeeMap* items); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); -static void library_photo_source_collection_real_postprocess_imported_media (MediaSourceCollection* base, GeeCollection* media_sources); +static gboolean library_photo_source_collection_real_is_file_recognized (MediaSourceCollection* base, + GFile* file); +static void library_photo_source_collection_real_notify_contents_altered (DataCollection* base, + GeeIterable* added, + GeeIterable* removed); +static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, + Photo* photo, + GFile* old_file, + GFile* new_file); +static void _library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, + GFile* old_file, + GFile* new_file, + gpointer self); +static void library_photo_source_collection_on_raw_development_modified (LibraryPhotoSourceCollection* self, + Photo* _photo); +static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, + gpointer self); +void data_collection_notify_contents_altered (DataCollection* self, + GeeIterable* added, + GeeIterable* removed); +static void library_photo_source_collection_real_items_altered (DataCollection* base, + GeeMap* items); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); +static void library_photo_source_collection_real_postprocess_imported_media (MediaSourceCollection* base, + GeeCollection* media_sources); GType tag_get_type (void) G_GNUC_CONST; gpointer hierarchical_tag_index_ref (gpointer instance); void hierarchical_tag_index_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_index (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_index (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_index (const GValue* value); GType hierarchical_tag_index_get_type (void) G_GNUC_CONST; HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void); @@ -2618,132 +3434,269 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self); HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_keywords (GeeCollection* h_keywords); GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self); GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self); -gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, const gchar* tag); +gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, + const gchar* tag); gchar* tag_prep_tag_name (const gchar* name); -gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, const gchar* name); +gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, + const gchar* name); Tag* tag_for_path (const gchar* name); GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self); void library_photo_clear_import_keywords (LibraryPhoto* self); -void tag_attach_many (Tag* self, GeeCollection* sources); -void media_source_collection_postprocess_imported_media (MediaSourceCollection* self, GeeCollection* media); -void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, gint64 numeric_id); -LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id); +void tag_attach_many (Tag* self, + GeeCollection* sources); +void media_source_collection_postprocess_imported_media (MediaSourceCollection* self, + GeeCollection* media); +void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, + gint64 numeric_id); +LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, + PhotoID* photo_id); gboolean media_source_is_trashed (MediaSource* self); gboolean media_source_is_offline (MediaSource* self); -static MediaSource* library_photo_source_collection_real_fetch_by_source_id (MediaSourceCollection* base, const gchar* source_id); -MediaSource* media_source_collection_fetch_by_numeric_id (MediaSourceCollection* self, gint64 numeric_id); -gint64 parse_int64 (const gchar* str, gint num_base); -static GeeCollection* library_photo_source_collection_real_get_event_source_ids (MediaSourceCollection* base, EventID* event_id); -GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event_id); -DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key); -LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPhotoSourceCollection* self, GFile* file); -LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (LibraryPhotoSourceCollection* self, GFile* file); -static void library_photo_source_collection_compare_backing (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matches_development); -gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info); -void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matched_development); +static MediaSource* library_photo_source_collection_real_fetch_by_source_id (MediaSourceCollection* base, + const gchar* source_id); +MediaSource* media_source_collection_fetch_by_numeric_id (MediaSourceCollection* self, + gint64 numeric_id); +gint64 parse_int64 (const gchar* str, + gint num_base); +static GeeCollection* library_photo_source_collection_real_get_event_source_ids (MediaSourceCollection* base, + EventID* event_id); +GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, + EventID* event_id); +DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, + gint64 key); +LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPhotoSourceCollection* self, + GFile* file); +LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (LibraryPhotoSourceCollection* self, + GFile* file); +static void library_photo_source_collection_compare_backing (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + GFileInfo* info, + GeeCollection* matches_master, + GeeCollection* matches_editable, + GeeCollection* matches_development); +gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, + GFileInfo* info); +void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, + GFileInfo* info, + GeeCollection* matches_master, + GeeCollection* matches_editable, + GeeCollection* matched_development); GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self); -void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize, PhotoID* result); -gint utf8_ci_compare (void* a, void* b); -gboolean library_photo_source_collection_has_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize); +void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, + const gchar* basename, + gint64 filesize, + PhotoID* result); +gint utf8_ci_compare (void* a, + void* b); +gboolean library_photo_source_collection_has_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, + const gchar* basename, + gint64 filesize); gboolean photo_id_is_valid (PhotoID *self); -LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self, GFile* file); -MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, GFile* file); -LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPhotoSourceHoldingTank* self, GFile* file); -LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5); -MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self, const gchar* md5); -LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self, GFile* file); -LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5); +LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self, + GFile* file); +MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, + GFile* file); +LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPhotoSourceHoldingTank* self, + GFile* file); +LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self, + const gchar* md5); +MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self, + const gchar* md5); +LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self, + GFile* file); +LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self, + const gchar* md5); gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollection* self); gint source_holding_tank_get_count (SourceHoldingTank* self); -LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, GFile* file, LibraryPhotoSourceCollectionState* state); -MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection* self, GFile* file); -static gboolean library_photo_source_collection_real_has_backlink (SourceCollection* base, SourceBacklink* backlink); -gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* backlink); -gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBacklink* backlink); -static void library_photo_source_collection_real_remove_backlink (SourceCollection* base, SourceBacklink* backlink); -void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklink* backlink); -void source_collection_remove_backlink (SourceCollection* self, SourceBacklink* backlink); +LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, + GFile* file, + LibraryPhotoSourceCollectionState* state); +MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection* self, + GFile* file); +static gboolean library_photo_source_collection_real_has_backlink (SourceCollection* base, + SourceBacklink* backlink); +gboolean source_collection_has_backlink (SourceCollection* self, + SourceBacklink* backlink); +gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, + SourceBacklink* backlink); +static void library_photo_source_collection_real_remove_backlink (SourceCollection* base, + SourceBacklink* backlink); +void source_holding_tank_remove_backlink (SourceHoldingTank* self, + SourceBacklink* backlink); +void source_collection_remove_backlink (SourceCollection* self, + SourceBacklink* backlink); MediaSourceTransactionController* media_source_transaction_controller_new (MediaSourceCollection* sources); -MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type, MediaSourceCollection* sources); +MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type, + MediaSourceCollection* sources); GType media_source_transaction_controller_get_type (void) G_GNUC_CONST; -static void library_photo_source_collection_real_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); -static void library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata); +static void library_photo_source_collection_real_master_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); +static void library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata); static void library_photo_source_collection_finalize (DataCollection * obj); GType flaggable_get_type (void) G_GNUC_CONST; GType monitorable_get_type (void) G_GNUC_CONST; #define LIBRARY_PHOTO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_PHOTO, LibraryPhotoPrivate)) -enum { - LIBRARY_PHOTO_DUMMY_PROPERTY -}; #define LIBRARY_PHOTO_FLAG_HIDDEN ((guint64) 0x0000000000000001) #define LIBRARY_PHOTO_FLAG_FAVORITE ((guint64) 0x0000000000000002) #define LIBRARY_PHOTO_FLAG_TRASH ((guint64) 0x0000000000000004) #define LIBRARY_PHOTO_FLAG_OFFLINE ((guint64) 0x0000000000000008) #define LIBRARY_PHOTO_FLAG_FLAGGED ((guint64) 0x0000000000000010) static LibraryPhoto* library_photo_new (PhotoRow* row); -static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row); +static LibraryPhoto* library_photo_construct (GType object_type, + PhotoRow* row); static void library_photo_generate_thumbnails (LibraryPhoto* self); static void _library_photo_generate_thumbnails_one_shot_callback (gpointer self); -void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated); -static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flags); +void data_source_rehydrate_backlinks (DataSource* self, + SourceCollection* unlinked_from, + const gchar* dehydrated); +static void library_photo_upgrade_rating_flags (LibraryPhoto* self, + guint64 flags); static LibraryPhoto* library_photo_new_from_import_params (PhotoImportParams* import_params); -static LibraryPhoto* library_photo_construct_from_import_params (GType object_type, PhotoImportParams* import_params); -void library_photo_init (ProgressMonitor monitor, void* monitor_target); +static LibraryPhoto* library_photo_construct_from_import_params (GType object_type, + PhotoImportParams* import_params); +void library_photo_init (ProgressMonitor monitor, + void* monitor_target); GeeArrayList* photo_table_get_all (PhotoTable* self); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -void media_source_collection_add_many_to_trash (MediaSourceCollection* self, GeeCollection* sources); -void media_source_collection_add_many_to_offline (MediaSourceCollection* self, GeeCollection* sources); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +void media_source_collection_add_many_to_trash (MediaSourceCollection* self, + GeeCollection* sources); +void media_source_collection_add_many_to_offline (MediaSourceCollection* self, + GeeCollection* sources); void library_photo_terminate (void); -ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto* * photo); -void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result); +ImportResult library_photo_import_create (PhotoImportParams* params, + LibraryPhoto* * photo); +void photo_table_add (PhotoTable* self, + PhotoRow* photo_row, + PhotoID* result); gboolean photo_id_is_invalid (PhotoID *self); void library_photo_import_failed (LibraryPhoto* photo); -void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error); -static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetadata* metadata); -static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMetadata* metadata); -static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetadata* metadata); -static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMetadata* metadata); -void thumbnail_cache_import_from_source (ThumbnailSource* source, gboolean force, GError** error); +void photo_table_remove (PhotoTable* self, + PhotoID* photo_id, + GError** error); +static void library_photo_real_notify_master_reimported (Photo* base, + PhotoMetadata* metadata); +static void library_photo_real_notify_editable_reimported (Photo* base, + PhotoMetadata* metadata); +static void library_photo_real_notify_source_reimported (Photo* base, + PhotoMetadata* metadata); +static void library_photo_real_notify_baseline_reimported (Photo* base, + PhotoMetadata* metadata); +void thumbnail_cache_import_from_source (ThumbnailSource* source, + gboolean force, + GError** error); void thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self); -static void library_photo_real_notify_altered (DataObject* base, Alteration* alteration); -gboolean alteration_has_subject (Alteration* self, const gchar* subject); -void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority); -static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error); -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); +static void library_photo_real_notify_altered (DataObject* base, + Alteration* alteration); +gboolean alteration_has_subject (Alteration* self, + const gchar* subject); +void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, + gint priority); +static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, + Scaling* scaling, + GError** error); +GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); GType thumbnail_cache_size_get_type (void) G_GNUC_CONST; -GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up); -static void library_photo_real_rotate (Photo* base, Rotation rotation); -void thumbnail_cache_rotate (ThumbnailSource* source, Rotation rotation, GError** error); -static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error); -GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, gint scale, GError** error); -static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPhotoRow* backing, BackingPhotoID* result, GError** error); -GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callback, void* progress_callback_target, gboolean blacklist, GError** error); -static void library_photo_on_duplicate_progress (LibraryPhoto* self, gint64 current, gint64 total); -static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, gint64 total_num_bytes, gpointer self); -LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error); -void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* new_filename, BackingPhotoID* editable_id, BackingPhotoID* develop_shotwell, BackingPhotoID* develop_camera_id, BackingPhotoID* develop_embedded_id, PhotoID* result); -PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id); -void thumbnail_cache_duplicate (ThumbnailSource* src_source, ThumbnailSource* dest_source); -gboolean data_collection_add (DataCollection* self, DataObject* object); +GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, + GdkPixbuf* pixbuf, + GdkInterpType interp, + gboolean scale_up); +static void library_photo_real_rotate (Photo* base, + Rotation rotation); +void thumbnail_cache_rotate (ThumbnailSource* source, + Rotation rotation, + GError** error); +static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); +GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, + gint scale, + GError** error); +static void library_photo_duplicate_backing_photo (LibraryPhoto* self, + BackingPhotoRow* backing, + BackingPhotoID* result, + GError** error); +GFile* library_files_duplicate (GFile* src, + GFileProgressCallback progress_callback, + void* progress_callback_target, + gboolean blacklist, + GError** error); +static void library_photo_on_duplicate_progress (LibraryPhoto* self, + gint64 current, + gint64 total); +static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, + gint64 total_num_bytes, + gpointer self); +LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, + GError** error); +void photo_table_duplicate (PhotoTable* self, + PhotoID* photo_id, + const gchar* new_filename, + BackingPhotoID* editable_id, + BackingPhotoID* develop_shotwell, + BackingPhotoID* develop_camera_id, + BackingPhotoID* develop_embedded_id, + PhotoID* result); +PhotoRow* photo_table_get_row (PhotoTable* self, + PhotoID* photo_id); +void thumbnail_cache_duplicate (ThumbnailSource* src_source, + ThumbnailSource* dest_source); +gboolean data_collection_add (DataCollection* self, + DataObject* object); GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; Event* media_source_get_event (MediaSource* self); -void event_attach (Event* self, MediaSource* source); +void event_attach (Event* self, + MediaSource* source); GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; -GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, MediaSource* source); -void tag_attach (Tag* self, MediaSource* source); +GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, + MediaSource* source); +void tag_attach (Tag* self, + MediaSource* source); void spin_event_loop (void); static gboolean library_photo_real_is_trashed (MediaSource* base); static void library_photo_real_trash (MediaSource* base); @@ -2754,43 +3707,82 @@ static void library_photo_real_mark_online (Monitorable* base); static gboolean library_photo_real_is_flagged (Flaggable* base); static void library_photo_real_mark_flagged (Flaggable* base); static void library_photo_real_mark_unflagged (Flaggable* base); -static gboolean library_photo_real_internal_delete_backing (DataSource* base, GError** error); +static gboolean library_photo_real_internal_delete_backing (DataSource* base, + GError** error); gboolean media_source_delete_original_file (MediaSource* self); static void library_photo_real_destroy (DataSource* base); void thumbnail_cache_remove (ThumbnailSource* source); void data_source_destroy (DataSource* self); -gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format); -void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, PhotoID* result); +gboolean library_photo_has_nontrash_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format); +void library_photo_get_nontrash_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format, + PhotoID* result); static gboolean library_photo_real_has_user_generated_metadata (Photo* base); Rating media_source_get_rating (MediaSource* self); gchar* data_object_get_name (DataObject* self); -static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoMetadata* metadata); -void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, PhotoMetadataSetOption option); -void photo_metadata_set_rating (PhotoMetadata* self, Rating rating); -static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, PhotoMetadata* metadata); +static void library_photo_real_set_user_metadata_for_export (Photo* base, + PhotoMetadata* metadata); +void photo_metadata_set_keywords (PhotoMetadata* self, + GeeCollection* keywords, + PhotoMetadataSetOption option); +void photo_metadata_set_rating (PhotoMetadata* self, + Rating rating); +static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, + PhotoMetadata* metadata); gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag); gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name); -gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root); +gboolean tag_source_collection_exists (TagSourceCollection* self, + const gchar* name, + gboolean treat_htags_as_root); static void library_photo_finalize (GObject * obj); #define LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTankPrivate)) -enum { - LIBRARY_PHOTO_SOURCE_HOLDING_TANK_DUMMY_PROPERTY -}; -MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -static void library_photo_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed); -static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhotoSourceHoldingTank* self, Photo* _photo, GFile* old_file, GFile* new_file); -static void _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self); -static void library_photo_source_holding_tank_on_raw_development_modified (LibraryPhotoSourceHoldingTank* self, Photo* _photo); -static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self); -void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed); +MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, + MediaSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +static void library_photo_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, + GeeCollection* added, + GeeCollection* removed); +static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhotoSourceHoldingTank* self, + Photo* _photo, + GFile* old_file, + GFile* new_file); +static void _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced (Photo* _sender, + GFile* old_file, + GFile* new_file, + gpointer self); +static void library_photo_source_holding_tank_on_raw_development_modified (LibraryPhotoSourceHoldingTank* self, + Photo* _photo); +static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, + gpointer self); +void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed); static void library_photo_source_holding_tank_finalize (SourceHoldingTank * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static const gchar* PHOTO_IMAGE_EXTENSIONS[69] = {"jpg", "jpeg", "jpe", "tiff", "tif", "png", "gif", "bmp", "ppm", "pgm", "pbm", "pnm", "thm", "tga", "ilbm", "pcx", "ecw", "img", "sid", "cd5", "fits", "pgf", "cgm", "svg", "odg", "eps", "pdf", "swf", "wmf", "emf", "xps", "pns", "jps", "mpo", "3fr", "arw", "srf", "sr2", "bay", "crw", "cr2", "cap", "iiq", "eip", "dcs", "dcr", "drf", "k25", "kdc", "dng", "erf", "fff", "mef", "mos", "mrw", "nef", "nrw", "orf", "ptx", "pef", "pxn", "r3d", "raf", "raw", "rw2", "rwl", "rwz", "x3f", "srw"}; -GType backing_fetch_mode_get_type (void) { +GType +backing_fetch_mode_get_type (void) +{ static volatile gsize backing_fetch_mode_type_id__volatile = 0; if (g_once_init_enter (&backing_fetch_mode_type_id__volatile)) { static const GEnumValue values[] = {{BACKING_FETCH_MODE_SOURCE, "BACKING_FETCH_MODE_SOURCE", "source"}, {BACKING_FETCH_MODE_BASELINE, "BACKING_FETCH_MODE_BASELINE", "baseline"}, {BACKING_FETCH_MODE_MASTER, "BACKING_FETCH_MODE_MASTER", "master"}, {BACKING_FETCH_MODE_UNMODIFIED, "BACKING_FETCH_MODE_UNMODIFIED", "unmodified"}, {0, NULL, NULL}}; @@ -2802,36 +3794,43 @@ GType backing_fetch_mode_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 41 "/home/jens/Source/shotwell/src/Photo.vala" return self ? g_object_ref (self) : NULL; -#line 2809 "Photo.c" +#line 3803 "Photo.c" } -static gpointer _thumbnails_ref0 (gpointer self) { +static gpointer +_thumbnails_ref0 (gpointer self) +{ #line 48 "/home/jens/Source/shotwell/src/Photo.vala" return self ? thumbnails_ref (self) : NULL; -#line 2816 "Photo.c" +#line 3812 "Photo.c" } -PhotoImportParams* photo_import_params_construct (GType object_type, 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) { +PhotoImportParams* +photo_import_params_construct (GType object_type, + 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) +{ PhotoImportParams* self = NULL; GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; - GFile* _tmp3_; - ImportID _tmp4_; - PhotoFileSnifferOptions _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; - const gchar* _tmp10_; - gchar* _tmp11_; - Thumbnails* _tmp12_; - Thumbnails* _tmp13_; + ImportID _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + Thumbnails* _tmp6_; #line 38 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 38 "/home/jens/Source/shotwell/src/Photo.vala" @@ -2843,79 +3842,77 @@ PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file #line 38 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoImportParams*) g_type_create_instance (object_type); #line 41 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 41 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 41 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->file); #line 41 "/home/jens/Source/shotwell/src/Photo.vala" - self->file = _tmp1_; -#line 42 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = final_associated_file; + self->file = _tmp0_; #line 42 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (final_associated_file); #line 42 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->final_associated_file); #line 42 "/home/jens/Source/shotwell/src/Photo.vala" - self->final_associated_file = _tmp3_; + self->final_associated_file = _tmp1_; #line 43 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = *import_id; + _tmp2_ = *import_id; #line 43 "/home/jens/Source/shotwell/src/Photo.vala" - self->import_id = _tmp4_; -#line 44 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = sniffer_options; + self->import_id = _tmp2_; #line 44 "/home/jens/Source/shotwell/src/Photo.vala" - self->sniffer_options = _tmp5_; -#line 45 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = exif_md5; + self->sniffer_options = sniffer_options; #line 45 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp3_ = g_strdup (exif_md5); #line 45 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->exif_md5); #line 45 "/home/jens/Source/shotwell/src/Photo.vala" - self->exif_md5 = _tmp7_; -#line 46 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = thumbnail_md5; + self->exif_md5 = _tmp3_; #line 46 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp4_ = g_strdup (thumbnail_md5); #line 46 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->thumbnail_md5); #line 46 "/home/jens/Source/shotwell/src/Photo.vala" - self->thumbnail_md5 = _tmp9_; + self->thumbnail_md5 = _tmp4_; #line 47 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = full_md5; -#line 47 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = g_strdup (_tmp10_); + _tmp5_ = g_strdup (full_md5); #line 47 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->full_md5); #line 47 "/home/jens/Source/shotwell/src/Photo.vala" - self->full_md5 = _tmp11_; -#line 48 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = thumbnails; + self->full_md5 = _tmp5_; #line 48 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _thumbnails_ref0 (_tmp12_); + _tmp6_ = _thumbnails_ref0 (thumbnails); #line 48 "/home/jens/Source/shotwell/src/Photo.vala" _thumbnails_unref0 (self->thumbnails); #line 48 "/home/jens/Source/shotwell/src/Photo.vala" - self->thumbnails = _tmp13_; + self->thumbnails = _tmp6_; #line 38 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 2904 "Photo.c" +#line 3889 "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) { +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 2911 "Photo.c" +#line 3905 "Photo.c" } -PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, GFile* file, ImportID* import_id) { +PhotoImportParams* +photo_import_params_construct_create_placeholder (GType object_type, + GFile* file, + ImportID* import_id) +{ PhotoImportParams* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; - ImportID _tmp2_; + ImportID _tmp1_; #line 52 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 52 "/home/jens/Source/shotwell/src/Photo.vala" @@ -2923,17 +3920,15 @@ PhotoImportParams* photo_import_params_construct_create_placeholder (GType objec #line 52 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoImportParams*) g_type_create_instance (object_type); #line 53 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 53 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 53 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->file); #line 53 "/home/jens/Source/shotwell/src/Photo.vala" - self->file = _tmp1_; + self->file = _tmp0_; #line 54 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = *import_id; + _tmp1_ = *import_id; #line 54 "/home/jens/Source/shotwell/src/Photo.vala" - self->import_id = _tmp2_; + self->import_id = _tmp1_; #line 55 "/home/jens/Source/shotwell/src/Photo.vala" self->sniffer_options = PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5; #line 56 "/home/jens/Source/shotwell/src/Photo.vala" @@ -2954,115 +3949,143 @@ PhotoImportParams* photo_import_params_construct_create_placeholder (GType objec self->thumbnails = NULL; #line 52 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 2958 "Photo.c" +#line 3953 "Photo.c" } -PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id) { +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 2965 "Photo.c" +#line 3963 "Photo.c" } -static void value_photo_import_params_init (GValue* value) { +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 2972 "Photo.c" +#line 3972 "Photo.c" } -static void value_photo_import_params_free_value (GValue* value) { +static void +value_photo_import_params_free_value (GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/Photo.vala" 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 2981 "Photo.c" +#line 3983 "Photo.c" } } -static void value_photo_import_params_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_import_params_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 21 "/home/jens/Source/shotwell/src/Photo.vala" 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 2991 "Photo.c" +#line 3996 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 2995 "Photo.c" +#line 4000 "Photo.c" } } -static gpointer value_photo_import_params_peek_pointer (const GValue* value) { +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 3003 "Photo.c" +#line 4010 "Photo.c" } -static gchar* value_photo_import_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 3010 "Photo.c" +#line 4022 "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 3017 "Photo.c" +#line 4029 "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 3021 "Photo.c" +#line 4033 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_import_params_ref (object); -#line 3025 "Photo.c" +#line 4037 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 3029 "Photo.c" +#line 4041 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 3033 "Photo.c" +#line 4045 "Photo.c" } -static gchar* value_photo_import_params_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_import_params_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoImportParams ** object_p; object_p = collect_values[0].v_pointer; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" 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 3044 "Photo.c" +#line 4061 "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 3050 "Photo.c" +#line 4067 "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 3054 "Photo.c" +#line 4071 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_import_params_ref (value->data[0].v_pointer); -#line 3058 "Photo.c" +#line 4075 "Photo.c" } #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 3062 "Photo.c" +#line 4079 "Photo.c" } -GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_import_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoImportParams* spec; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_IMPORT_PARAMS), NULL); @@ -3072,20 +4095,25 @@ 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 3076 "Photo.c" +#line 4099 "Photo.c" } -gpointer value_get_photo_import_params (const GValue* value) { +gpointer +value_get_photo_import_params (const GValue* value) +{ #line 21 "/home/jens/Source/shotwell/src/Photo.vala" 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 3085 "Photo.c" +#line 4110 "Photo.c" } -void value_set_photo_import_params (GValue* value, gpointer v_object) { +void +value_set_photo_import_params (GValue* value, + gpointer v_object) +{ PhotoImportParams * old; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS)); @@ -3101,22 +4129,25 @@ 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 3105 "Photo.c" +#line 4133 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 3109 "Photo.c" +#line 4137 "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 3115 "Photo.c" +#line 4143 "Photo.c" } } -void value_take_photo_import_params (GValue* value, gpointer v_object) { +void +value_take_photo_import_params (GValue* value, + gpointer v_object) +{ PhotoImportParams * old; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS)); @@ -3130,31 +4161,35 @@ 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 3134 "Photo.c" +#line 4165 "Photo.c" } else { #line 21 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 3138 "Photo.c" +#line 4169 "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 3144 "Photo.c" +#line 4175 "Photo.c" } } -static void photo_import_params_class_init (PhotoImportParamsClass * klass) { +static void +photo_import_params_class_init (PhotoImportParamsClass * klass) +{ #line 21 "/home/jens/Source/shotwell/src/Photo.vala" 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 3154 "Photo.c" +#line 4187 "Photo.c" } -static void photo_import_params_instance_init (PhotoImportParams * self) { +static void +photo_import_params_instance_init (PhotoImportParams * self) +{ PhotoRow* _tmp0_; #line 24 "/home/jens/Source/shotwell/src/Photo.vala" self->final_associated_file = NULL; @@ -3166,11 +4201,13 @@ 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 3170 "Photo.c" +#line 4205 "Photo.c" } -static void photo_import_params_finalize (PhotoImportParams * obj) { +static void +photo_import_params_finalize (PhotoImportParams * obj) +{ PhotoImportParams * self; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_IMPORT_PARAMS, PhotoImportParams); @@ -3192,11 +4229,13 @@ 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 3196 "Photo.c" +#line 4233 "Photo.c" } -GType photo_import_params_get_type (void) { +GType +photo_import_params_get_type (void) +{ static volatile gsize photo_import_params_type_id__volatile = 0; if (g_once_init_enter (&photo_import_params_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_import_params_init, value_photo_import_params_free_value, value_photo_import_params_copy_value, value_photo_import_params_peek_pointer, "p", value_photo_import_params_collect_value, "p", value_photo_import_params_lcopy_value }; @@ -3210,18 +4249,22 @@ GType photo_import_params_get_type (void) { } -gpointer photo_import_params_ref (gpointer instance) { +gpointer +photo_import_params_ref (gpointer instance) +{ PhotoImportParams * self; self = instance; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 21 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 3221 "Photo.c" +#line 4262 "Photo.c" } -void photo_import_params_unref (gpointer instance) { +void +photo_import_params_unref (gpointer instance) +{ PhotoImportParams * self; self = instance; #line 21 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3230,22 +4273,26 @@ 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 3234 "Photo.c" +#line 4277 "Photo.c" } } -PhotoTransformationState* photo_transformation_state_construct (GType object_type) { +PhotoTransformationState* +photo_transformation_state_construct (GType object_type) +{ PhotoTransformationState * self = NULL; #line 72 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoTransformationState*) g_object_new (object_type, NULL); #line 72 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 3245 "Photo.c" +#line 4290 "Photo.c" } -gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) { +gboolean +photo_transformation_state_is_broken (PhotoTransformationState* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 75 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3256,18 +4303,22 @@ gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) { result = _tmp0_; #line 76 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3260 "Photo.c" +#line 4307 "Photo.c" } -static void photo_transformation_state_real_broken (PhotoTransformationState* self) { +static void +photo_transformation_state_real_broken (PhotoTransformationState* self) +{ #line 69 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->is_broke = TRUE; -#line 3267 "Photo.c" +#line 4316 "Photo.c" } -static void photo_transformation_state_class_init (PhotoTransformationStateClass * klass) { +static void +photo_transformation_state_class_init (PhotoTransformationStateClass * klass) +{ #line 63 "/home/jens/Source/shotwell/src/Photo.vala" photo_transformation_state_parent_class = g_type_class_peek_parent (klass); #line 63 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3278,30 +4329,36 @@ static void photo_transformation_state_class_init (PhotoTransformationStateClass G_OBJECT_CLASS (klass)->finalize = photo_transformation_state_finalize; #line 63 "/home/jens/Source/shotwell/src/Photo.vala" photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoTransformationStateClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3282 "Photo.c" +#line 4333 "Photo.c" } -static void photo_transformation_state_instance_init (PhotoTransformationState * self) { +static void +photo_transformation_state_instance_init (PhotoTransformationState * self) +{ #line 63 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = PHOTO_TRANSFORMATION_STATE_GET_PRIVATE (self); #line 64 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->is_broke = FALSE; -#line 3291 "Photo.c" +#line 4344 "Photo.c" } -static void photo_transformation_state_finalize (GObject * obj) { +static void +photo_transformation_state_finalize (GObject * obj) +{ PhotoTransformationState * self; #line 63 "/home/jens/Source/shotwell/src/Photo.vala" 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 3301 "Photo.c" +#line 4356 "Photo.c" } -GType photo_transformation_state_get_type (void) { +GType +photo_transformation_state_get_type (void) +{ static volatile gsize photo_transformation_state_type_id__volatile = 0; if (g_once_init_enter (&photo_transformation_state_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoTransformationStateClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_transformation_state_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoTransformationState), 0, (GInstanceInitFunc) photo_transformation_state_instance_init, NULL }; @@ -3313,168 +4370,174 @@ GType photo_transformation_state_get_type (void) { } -gboolean rating_can_increase (Rating self) { +gboolean +rating_can_increase (Rating self) +{ gboolean result = FALSE; #line 90 "/home/jens/Source/shotwell/src/Photo.vala" result = self < RATING_FIVE; #line 90 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3323 "Photo.c" +#line 4382 "Photo.c" } -gboolean rating_can_decrease (Rating self) { +gboolean +rating_can_decrease (Rating self) +{ gboolean result = FALSE; #line 94 "/home/jens/Source/shotwell/src/Photo.vala" result = self > RATING_REJECTED; #line 94 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3333 "Photo.c" +#line 4394 "Photo.c" } -gboolean rating_is_valid (Rating self) { +gboolean +rating_is_valid (Rating self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; #line 98 "/home/jens/Source/shotwell/src/Photo.vala" if (self >= RATING_REJECTED) { #line 98 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self <= RATING_FIVE; -#line 3344 "Photo.c" +#line 4407 "Photo.c" } else { #line 98 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 3348 "Photo.c" +#line 4411 "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 3354 "Photo.c" +#line 4417 "Photo.c" } -Rating rating_increase (Rating self) { +Rating +rating_increase (Rating self) +{ Rating result = 0; Rating _tmp0_ = 0; - gboolean _tmp1_; #line 102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = rating_can_increase (self); -#line 102 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { + if (rating_can_increase (self)) { #line 102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self + 1; -#line 3368 "Photo.c" +#line 4430 "Photo.c" } else { #line 102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self; -#line 3372 "Photo.c" +#line 4434 "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 3378 "Photo.c" +#line 4440 "Photo.c" } -Rating rating_decrease (Rating self) { +Rating +rating_decrease (Rating self) +{ Rating result = 0; Rating _tmp0_ = 0; - gboolean _tmp1_; -#line 106 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = rating_can_decrease (self); #line 106 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { + if (rating_can_decrease (self)) { #line 106 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self - 1; -#line 3392 "Photo.c" +#line 4453 "Photo.c" } else { #line 106 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self; -#line 3396 "Photo.c" +#line 4457 "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 3402 "Photo.c" +#line 4463 "Photo.c" } -gint rating_serialize (Rating self) { +gint +rating_serialize (Rating self) +{ gint result = 0; #line 110 "/home/jens/Source/shotwell/src/Photo.vala" switch (self) { #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_REJECTED: -#line 3412 "Photo.c" +#line 4475 "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 3418 "Photo.c" +#line 4481 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_UNRATED: -#line 3422 "Photo.c" +#line 4485 "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 3428 "Photo.c" +#line 4491 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_ONE: -#line 3432 "Photo.c" +#line 4495 "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 3438 "Photo.c" +#line 4501 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_TWO: -#line 3442 "Photo.c" +#line 4505 "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 3448 "Photo.c" +#line 4511 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_THREE: -#line 3452 "Photo.c" +#line 4515 "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 3458 "Photo.c" +#line 4521 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_FOUR: -#line 3462 "Photo.c" +#line 4525 "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 3468 "Photo.c" +#line 4531 "Photo.c" } #line 110 "/home/jens/Source/shotwell/src/Photo.vala" case RATING_FIVE: -#line 3472 "Photo.c" +#line 4535 "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 3478 "Photo.c" +#line 4541 "Photo.c" } default: { @@ -3482,111 +4545,104 @@ gint rating_serialize (Rating self) { result = 0; #line 126 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3486 "Photo.c" +#line 4549 "Photo.c" } } } -Rating rating_unserialize (gint value) { +Rating +rating_unserialize (gint value) +{ Rating result = 0; - gint _tmp0_; - gint _tmp2_; #line 131 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = value; -#line 131 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ > ((gint) RATING_FIVE)) { + if (value > ((gint) RATING_FIVE)) { #line 132 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_FIVE; #line 132 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3504 "Photo.c" +#line 4565 "Photo.c" } else { - gint _tmp1_; -#line 133 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = value; #line 133 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_ < ((gint) RATING_REJECTED)) { + if (value < ((gint) RATING_REJECTED)) { #line 134 "/home/jens/Source/shotwell/src/Photo.vala" result = RATING_REJECTED; #line 134 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3515 "Photo.c" +#line 4573 "Photo.c" } } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = value; -#line 136 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp2_) { + switch (value) { #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case -1: -#line 3524 "Photo.c" +#line 4580 "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 3530 "Photo.c" +#line 4586 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 0: -#line 3534 "Photo.c" +#line 4590 "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 3540 "Photo.c" +#line 4596 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 1: -#line 3544 "Photo.c" +#line 4600 "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 3550 "Photo.c" +#line 4606 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 2: -#line 3554 "Photo.c" +#line 4610 "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 3560 "Photo.c" +#line 4616 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 3: -#line 3564 "Photo.c" +#line 4620 "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 3570 "Photo.c" +#line 4626 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 4: -#line 3574 "Photo.c" +#line 4630 "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 3580 "Photo.c" +#line 4636 "Photo.c" } #line 136 "/home/jens/Source/shotwell/src/Photo.vala" case 5: -#line 3584 "Photo.c" +#line 4640 "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 3590 "Photo.c" +#line 4646 "Photo.c" } default: { @@ -3594,13 +4650,15 @@ Rating rating_unserialize (gint value) { result = RATING_UNRATED; #line 152 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3598 "Photo.c" +#line 4654 "Photo.c" } } } -GType rating_get_type (void) { +GType +rating_get_type (void) +{ static volatile gsize rating_type_id__volatile = 0; if (g_once_init_enter (&rating_type_id__volatile)) { static const GEnumValue values[] = {{RATING_REJECTED, "RATING_REJECTED", "rejected"}, {RATING_UNRATED, "RATING_UNRATED", "unrated"}, {RATING_ONE, "RATING_ONE", "one"}, {RATING_TWO, "RATING_TWO", "two"}, {RATING_THREE, "RATING_THREE", "three"}, {RATING_FOUR, "RATING_FOUR", "four"}, {RATING_FIVE, "RATING_FIVE", "five"}, {0, NULL, NULL}}; @@ -3612,33 +4670,35 @@ GType rating_get_type (void) { } -gboolean photo_exception_prohibits (PhotoException self, PhotoException exception) { +gboolean +photo_exception_prohibits (PhotoException self, + PhotoException exception) +{ gboolean result = FALSE; - PhotoException _tmp0_; #line 228 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = exception; -#line 228 "/home/jens/Source/shotwell/src/Photo.vala" - result = (self & _tmp0_) != 0; + result = (self & exception) != 0; #line 228 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3625 "Photo.c" +#line 4683 "Photo.c" } -gboolean photo_exception_allows (PhotoException self, PhotoException exception) { +gboolean +photo_exception_allows (PhotoException self, + PhotoException exception) +{ gboolean result = FALSE; - PhotoException _tmp0_; -#line 232 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = exception; #line 232 "/home/jens/Source/shotwell/src/Photo.vala" - result = (self & _tmp0_) == 0; + result = (self & exception) == 0; #line 232 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 3638 "Photo.c" +#line 4696 "Photo.c" } -GType photo_exception_get_type (void) { +GType +photo_exception_get_type (void) +{ static volatile gsize photo_exception_type_id__volatile = 0; if (g_once_init_enter (&photo_exception_type_id__volatile)) { static const GEnumValue values[] = {{PHOTO_EXCEPTION_NONE, "PHOTO_EXCEPTION_NONE", "none"}, {PHOTO_EXCEPTION_ORIENTATION, "PHOTO_EXCEPTION_ORIENTATION", "orientation"}, {PHOTO_EXCEPTION_CROP, "PHOTO_EXCEPTION_CROP", "crop"}, {PHOTO_EXCEPTION_REDEYE, "PHOTO_EXCEPTION_REDEYE", "redeye"}, {PHOTO_EXCEPTION_ADJUST, "PHOTO_EXCEPTION_ADJUST", "adjust"}, {PHOTO_EXCEPTION_STRAIGHTEN, "PHOTO_EXCEPTION_STRAIGHTEN", "straighten"}, {PHOTO_EXCEPTION_ALL, "PHOTO_EXCEPTION_ALL", "all"}, {0, NULL, NULL}}; @@ -3650,251 +4710,232 @@ GType photo_exception_get_type (void) { } -static gpointer _photo_row_ref0 (gpointer self) { +static gpointer +_photo_row_ref0 (gpointer self) +{ #line 400 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_row_ref (self) : NULL; -#line 3657 "Photo.c" +#line 4719 "Photo.c" } -static gpointer _backing_photo_row_ref0 (gpointer self) { +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 3664 "Photo.c" +#line 4728 "Photo.c" } -Photo* photo_construct (GType object_type, PhotoRow* row) { +Photo* +photo_construct (GType object_type, + PhotoRow* row) +{ Photo * self = NULL; PhotoRow* _tmp0_; PhotoRow* _tmp1_; PhotoRow* _tmp2_; - PhotoRow* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; + const gchar* _tmp3_; + gchar* _tmp4_; + PhotoRow* _tmp5_; PhotoRow* _tmp6_; - PhotoRow* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; - PhotoBackingReaders* _tmp10_; - PhotoRow* _tmp11_; + const gchar* _tmp7_; + gchar* _tmp8_; + PhotoBackingReaders* _tmp9_; + BackingPhotoRow* _tmp10_; + PhotoFileFormat _tmp11_; BackingPhotoRow* _tmp12_; - PhotoFileFormat _tmp13_; - PhotoRow* _tmp14_; + const gchar* _tmp13_; + PhotoFileReader* _tmp14_; + gchar* basename = NULL; BackingPhotoRow* _tmp15_; const gchar* _tmp16_; - PhotoFileReader* _tmp17_; - gchar* basename = NULL; - PhotoRow* _tmp18_; - BackingPhotoRow* _tmp19_; - const gchar* _tmp20_; - gchar* _tmp21_; - const gchar* _tmp22_; - const gchar* _tmp25_; - gboolean _tmp26_; - PhotoRow* _tmp31_; - BackingPhotoID _tmp32_; - gint64 _tmp33_; - PhotoRow* _tmp49_; - BackingPhotoRow* _tmp50_; - PhotoFileFormat _tmp51_; - gboolean _tmp67_ = FALSE; - PhotoRow* _tmp68_; - BackingPhotoRow* _tmp69_; - PhotoFileFormat _tmp70_; - PhotoBackingReaders* _tmp85_; - PhotoFileReader* _tmp86_; - PhotoRow* _tmp106_; - time_t _tmp107_; + gchar* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp21_; + BackingPhotoID _tmp25_; + gint64 _tmp26_; + BackingPhotoRow* _tmp41_; + PhotoFileFormat _tmp42_; + gboolean _tmp57_ = FALSE; + BackingPhotoRow* _tmp58_; + PhotoFileFormat _tmp59_; + PhotoBackingReaders* _tmp71_; + PhotoFileReader* _tmp72_; + PhotoRow* _tmp88_; + time_t _tmp89_; GError * _inner_error_ = NULL; #line 399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_ROW (row), NULL); #line 399 "/home/jens/Source/shotwell/src/Photo.vala" self = (Photo*) photo_source_construct (object_type, DATA_OBJECT_INVALID_OBJECT_ID); #line 400 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = row; -#line 400 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _photo_row_ref0 (_tmp0_); + _tmp0_ = _photo_row_ref0 (row); #line 400 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (self->row); #line 400 "/home/jens/Source/shotwell/src/Photo.vala" - self->row = _tmp1_; + self->row = _tmp0_; #line 403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->row; + _tmp2_ = self->row; #line 403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_->title; + _tmp3_ = _tmp2_->title; #line 403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = media_source_prep_title (_tmp4_); + _tmp4_ = media_source_prep_title (_tmp3_); #line 403 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp2_->title); + _g_free0 (_tmp1_->title); #line 403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_->title = _tmp5_; + _tmp1_->title = _tmp4_; #line 404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + _tmp6_ = self->row; #line 404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->comment; + _tmp7_ = _tmp6_->comment; #line 404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = media_source_prep_comment (_tmp8_); + _tmp8_ = media_source_prep_comment (_tmp7_); #line 404 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp6_->comment); + _g_free0 (_tmp5_->comment); #line 404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_->comment = _tmp9_; -#line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->priv->readers; + _tmp5_->comment = _tmp8_; #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = row; + _tmp9_ = self->priv->readers; #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_->master; + _tmp10_ = row->master; #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_->file_format; + _tmp11_ = _tmp10_->file_format; #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = row; + _tmp12_ = row->master; #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->master; -#line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_->filepath; + _tmp13_ = _tmp12_->filepath; #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_file_format_create_reader (_tmp13_, _tmp16_); + _tmp14_ = photo_file_format_create_reader (_tmp11_, _tmp13_); #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp10_->master); + _photo_file_adapter_unref0 (_tmp9_->master); #line 408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_->master = _tmp17_; + _tmp9_->master = _tmp14_; #line 411 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = row; + _tmp15_ = row->master; #line 411 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->master; -#line 411 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_->filepath; + _tmp16_ = _tmp15_->filepath; #line 411 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = string_sliced_at_last_char (_tmp20_, (gunichar) G_DIR_SEPARATOR, 0); + _tmp17_ = string_sliced_at_last_char (_tmp16_, (gunichar) G_DIR_SEPARATOR, 0); #line 411 "/home/jens/Source/shotwell/src/Photo.vala" - basename = _tmp21_; + basename = _tmp17_; #line 412 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = basename; + _tmp18_ = basename; #line 412 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_ != NULL) { -#line 3781 "Photo.c" - const gchar* _tmp23_; - gchar* _tmp24_; + if (_tmp18_ != NULL) { +#line 4832 "Photo.c" + const gchar* _tmp19_; + gchar* _tmp20_; #line 413 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = basename; + _tmp19_ = basename; #line 413 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = string_sliced_at (_tmp23_, 1); + _tmp20_ = string_sliced_at (_tmp19_, 1); #line 413 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->priv->file_title); #line 413 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->file_title = _tmp24_; -#line 3792 "Photo.c" + self->priv->file_title = _tmp20_; +#line 4843 "Photo.c" } #line 415 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->priv->file_title; -#line 415 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = is_string_empty (_tmp25_); + _tmp21_ = self->priv->file_title; #line 415 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp26_) { -#line 3800 "Photo.c" - PhotoRow* _tmp27_; - BackingPhotoRow* _tmp28_; - const gchar* _tmp29_; - gchar* _tmp30_; -#line 416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = row; + if (is_string_empty (_tmp21_)) { +#line 4849 "Photo.c" + BackingPhotoRow* _tmp22_; + const gchar* _tmp23_; + gchar* _tmp24_; #line 416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_->master; + _tmp22_ = row->master; #line 416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_->filepath; + _tmp23_ = _tmp22_->filepath; #line 416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = g_strdup (_tmp29_); + _tmp24_ = g_strdup (_tmp23_); #line 416 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->priv->file_title); #line 416 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->file_title = _tmp30_; -#line 3817 "Photo.c" + self->priv->file_title = _tmp24_; +#line 4863 "Photo.c" } #line 418 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = row; -#line 418 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_->editable_id; + _tmp25_ = row->editable_id; #line 418 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_.id; + _tmp26_ = _tmp25_.id; #line 418 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp33_ != BACKING_PHOTO_ID_INVALID) { -#line 3827 "Photo.c" + if (_tmp26_ != BACKING_PHOTO_ID_INVALID) { +#line 4871 "Photo.c" BackingPhotoRow* e = NULL; - PhotoRow* _tmp34_; - BackingPhotoID _tmp35_; - BackingPhotoRow* _tmp36_; - BackingPhotoRow* _tmp37_; -#line 419 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = row; + BackingPhotoID _tmp27_; + BackingPhotoRow* _tmp28_; + BackingPhotoRow* _tmp29_; #line 419 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_->editable_id; + _tmp27_ = row->editable_id; #line 419 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = photo_get_backing_row (self, &_tmp35_); + _tmp28_ = photo_get_backing_row (self, &_tmp27_); #line 419 "/home/jens/Source/shotwell/src/Photo.vala" - e = _tmp36_; + e = _tmp28_; #line 420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = e; + _tmp29_ = e; #line 420 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp37_ != NULL) { -#line 3845 "Photo.c" - BackingPhotoRow* _tmp38_; - BackingPhotoRow* _tmp39_; - PhotoBackingReaders* _tmp40_; - BackingPhotoRow* _tmp41_; - PhotoFileFormat _tmp42_; - BackingPhotoRow* _tmp43_; - const gchar* _tmp44_; - PhotoFileReader* _tmp45_; + if (_tmp29_ != NULL) { +#line 4886 "Photo.c" + BackingPhotoRow* _tmp30_; + BackingPhotoRow* _tmp31_; + PhotoBackingReaders* _tmp32_; + BackingPhotoRow* _tmp33_; + PhotoFileFormat _tmp34_; + BackingPhotoRow* _tmp35_; + const gchar* _tmp36_; + PhotoFileReader* _tmp37_; #line 421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = e; + _tmp30_ = e; #line 421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _backing_photo_row_ref0 (_tmp38_); + _tmp31_ = _backing_photo_row_ref0 (_tmp30_); #line 421 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); #line 421 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->editable = _tmp39_; + self->priv->editable = _tmp31_; #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = self->priv->readers; + _tmp32_ = self->priv->readers; #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = self->priv->editable; + _tmp33_ = self->priv->editable; #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_->file_format; + _tmp34_ = _tmp33_->file_format; #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = self->priv->editable; + _tmp35_ = self->priv->editable; #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp43_->filepath; + _tmp36_ = _tmp35_->filepath; #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = photo_file_format_create_reader (_tmp42_, _tmp44_); + _tmp37_ = photo_file_format_create_reader (_tmp34_, _tmp36_); #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp40_->editable); + _photo_file_adapter_unref0 (_tmp32_->editable); #line 422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_->editable = _tmp45_; -#line 3878 "Photo.c" + _tmp32_->editable = _tmp37_; +#line 4919 "Photo.c" } else { { - PhotoTable* _tmp46_; - PhotoTable* _tmp47_; - PhotoRow* _tmp48_; + PhotoTable* _tmp38_; + PhotoTable* _tmp39_; + PhotoRow* _tmp40_; #line 425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = photo_table_get_instance (); + _tmp38_ = photo_table_get_instance (); #line 425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _tmp46_; + _tmp39_ = _tmp38_; #line 425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = self->row; + _tmp40_ = self->row; #line 425 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_detach_editable (_tmp47_, _tmp48_, &_inner_error_); + photo_table_detach_editable (_tmp39_, _tmp40_, &_inner_error_); #line 425 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp47_); + _database_table_unref0 (_tmp39_); #line 425 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 425 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3898 "Photo.c" +#line 4939 "Photo.c" goto __catch268_database_error; } #line 425 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3907,7 +4948,7 @@ 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 3911 "Photo.c" +#line 4952 "Photo.c" } } goto __finally268; @@ -3920,7 +4961,7 @@ 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 3924 "Photo.c" +#line 4965 "Photo.c" } __finally268: #line 424 "/home/jens/Source/shotwell/src/Photo.vala" @@ -3935,304 +4976,278 @@ 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 3939 "Photo.c" +#line 4980 "Photo.c" } #line 432 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 3943 "Photo.c" +#line 4984 "Photo.c" } #line 418 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (e); -#line 3947 "Photo.c" +#line 4988 "Photo.c" } #line 436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = row; + _tmp41_ = row->master; #line 436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = _tmp49_->master; + _tmp42_ = _tmp41_->file_format; #line 436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _tmp50_->file_format; -#line 436 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp51_ == PHOTO_FILE_FORMAT_RAW) { -#line 3957 "Photo.c" - GeeHashMap* _tmp52_; - gint _tmp53_; - RawDeveloper* _tmp54_; + if (_tmp42_ == PHOTO_FILE_FORMAT_RAW) { +#line 4996 "Photo.c" + GeeHashMap* _tmp43_; + gint _tmp44_; + RawDeveloper* _tmp45_; #line 438 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = gee_hash_map_new (TYPE_RAW_DEVELOPER, NULL, NULL, TYPE_BACKING_PHOTO_ROW, (GBoxedCopyFunc) backing_photo_row_ref, (GDestroyNotify) backing_photo_row_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp43_ = gee_hash_map_new (TYPE_RAW_DEVELOPER, NULL, NULL, TYPE_BACKING_PHOTO_ROW, (GBoxedCopyFunc) backing_photo_row_ref, (GDestroyNotify) backing_photo_row_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 438 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->developments); #line 438 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->developments = _tmp52_; + self->priv->developments = _tmp43_; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = raw_developer_as_array (&_tmp53_); -#line 3969 "Photo.c" + _tmp45_ = raw_developer_as_array (&_tmp44_); +#line 5008 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; gint _d_collection_size_ = 0; gint d_it = 0; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection = _tmp54_; + d_collection = _tmp45_; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection_length1 = _tmp53_; + d_collection_length1 = _tmp44_; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" - for (d_it = 0; d_it < _tmp53_; d_it = d_it + 1) { -#line 3981 "Photo.c" + for (d_it = 0; d_it < _tmp44_; d_it = d_it + 1) { +#line 5020 "Photo.c" RawDeveloper d = 0; #line 439 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 3985 "Photo.c" +#line 5024 "Photo.c" { BackingPhotoID id = {0}; - PhotoRow* _tmp55_; - BackingPhotoID* _tmp56_; - gint _tmp56__length1; - RawDeveloper _tmp57_; - BackingPhotoID _tmp58_; - BackingPhotoID _tmp59_; - gint64 _tmp60_; + BackingPhotoID* _tmp46_; + gint _tmp46__length1; + RawDeveloper _tmp47_; + BackingPhotoID _tmp48_; + BackingPhotoID _tmp49_; + gint64 _tmp50_; #line 440 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = row; + _tmp46_ = row->development_ids; #line 440 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = _tmp55_->development_ids; + _tmp46__length1 = row->development_ids_length1; #line 440 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56__length1 = _tmp55_->development_ids_length1; + _tmp47_ = d; #line 440 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = d; + _tmp48_ = _tmp46_[_tmp47_]; #line 440 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _tmp56_[_tmp57_]; -#line 440 "/home/jens/Source/shotwell/src/Photo.vala" - id = _tmp58_; + id = _tmp48_; #line 441 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = id; + _tmp49_ = id; #line 441 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = _tmp59_.id; + _tmp50_ = _tmp49_.id; #line 441 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp60_ != BACKING_PHOTO_ID_INVALID) { -#line 4013 "Photo.c" + if (_tmp50_ != BACKING_PHOTO_ID_INVALID) { +#line 5049 "Photo.c" BackingPhotoRow* bpr = NULL; - BackingPhotoID _tmp61_; - BackingPhotoRow* _tmp62_; - BackingPhotoRow* _tmp63_; + BackingPhotoID _tmp51_; + BackingPhotoRow* _tmp52_; + BackingPhotoRow* _tmp53_; #line 442 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = id; + _tmp51_ = id; #line 442 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = photo_get_backing_row (self, &_tmp61_); + _tmp52_ = photo_get_backing_row (self, &_tmp51_); #line 442 "/home/jens/Source/shotwell/src/Photo.vala" - bpr = _tmp62_; + bpr = _tmp52_; #line 443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = bpr; + _tmp53_ = bpr; #line 443 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp63_ != NULL) { -#line 4028 "Photo.c" - GeeHashMap* _tmp64_; - RawDeveloper _tmp65_; - BackingPhotoRow* _tmp66_; + if (_tmp53_ != NULL) { +#line 5064 "Photo.c" + GeeHashMap* _tmp54_; + RawDeveloper _tmp55_; + BackingPhotoRow* _tmp56_; #line 444 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = self->priv->developments; + _tmp54_ = self->priv->developments; #line 444 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = d; + _tmp55_ = d; #line 444 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = bpr; + _tmp56_ = 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 4040 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp55_), _tmp56_); +#line 5076 "Photo.c" } #line 441 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 4044 "Photo.c" +#line 5080 "Photo.c" } } } #line 439 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 4050 "Photo.c" +#line 5086 "Photo.c" } } #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = row; -#line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = _tmp68_->master; + _tmp58_ = row->master; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = _tmp69_->file_format; + _tmp59_ = _tmp58_->file_format; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp70_ == PHOTO_FILE_FORMAT_RAW) { -#line 4061 "Photo.c" - GeeHashMap* _tmp71_; - PhotoRow* _tmp72_; - RawDeveloper _tmp73_; - gboolean _tmp74_; -#line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = self->priv->developments; + if (_tmp59_ == PHOTO_FILE_FORMAT_RAW) { +#line 5095 "Photo.c" + GeeHashMap* _tmp60_; + RawDeveloper _tmp61_; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = row; + _tmp60_ = self->priv->developments; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = _tmp72_->developer; + _tmp61_ = row->developer; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _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 4076 "Photo.c" + _tmp57_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp61_)); +#line 5104 "Photo.c" } else { #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = FALSE; -#line 4080 "Photo.c" + _tmp57_ = FALSE; +#line 5108 "Photo.c" } #line 450 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp67_) { -#line 4084 "Photo.c" + if (_tmp57_) { +#line 5112 "Photo.c" BackingPhotoRow* r = NULL; - GeeHashMap* _tmp75_; - PhotoRow* _tmp76_; - RawDeveloper _tmp77_; - gpointer _tmp78_; - PhotoBackingReaders* _tmp79_; - BackingPhotoRow* _tmp80_; - PhotoFileFormat _tmp81_; - BackingPhotoRow* _tmp82_; - const gchar* _tmp83_; - PhotoFileReader* _tmp84_; -#line 451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = self->priv->developments; + GeeHashMap* _tmp62_; + RawDeveloper _tmp63_; + gpointer _tmp64_; + PhotoBackingReaders* _tmp65_; + BackingPhotoRow* _tmp66_; + PhotoFileFormat _tmp67_; + BackingPhotoRow* _tmp68_; + const gchar* _tmp69_; + PhotoFileReader* _tmp70_; #line 451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = row; + _tmp62_ = self->priv->developments; #line 451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = _tmp76_->developer; + _tmp63_ = row->developer; #line 451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp77_)); + _tmp64_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp63_)); #line 451 "/home/jens/Source/shotwell/src/Photo.vala" - r = (BackingPhotoRow*) _tmp78_; + r = (BackingPhotoRow*) _tmp64_; #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = self->priv->readers; + _tmp65_ = self->priv->readers; #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = r; + _tmp66_ = r; #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = _tmp80_->file_format; + _tmp67_ = _tmp66_->file_format; #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = r; + _tmp68_ = r; #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = _tmp82_->filepath; + _tmp69_ = _tmp68_->filepath; #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = photo_file_format_create_reader (_tmp81_, _tmp83_); + _tmp70_ = photo_file_format_create_reader (_tmp67_, _tmp69_); #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp79_->developer); + _photo_file_adapter_unref0 (_tmp65_->developer); #line 452 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_->developer = _tmp84_; + _tmp65_->developer = _tmp70_; #line 450 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (r); -#line 4124 "Photo.c" +#line 5149 "Photo.c" } #line 456 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = self->priv->readers; + _tmp71_ = self->priv->readers; #line 456 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = _tmp85_->editable; + _tmp72_ = _tmp71_->editable; #line 456 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp86_ != NULL) { -#line 4132 "Photo.c" - BackingPhotoRow* _tmp87_; - BackingPhotoRow* _tmp88_; + if (_tmp72_ != NULL) { +#line 5157 "Photo.c" + BackingPhotoRow* _tmp73_; + BackingPhotoRow* _tmp74_; #line 457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = self->priv->editable; + _tmp73_ = self->priv->editable; #line 457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = _backing_photo_row_ref0 (_tmp87_); + _tmp74_ = _backing_photo_row_ref0 (_tmp73_); #line 457 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 457 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = _tmp88_; -#line 4143 "Photo.c" + self->backing_photo_row = _tmp74_; +#line 5168 "Photo.c" } else { - PhotoRow* _tmp89_; - BackingPhotoRow* _tmp90_; - PhotoFileFormat _tmp91_; + BackingPhotoRow* _tmp75_; + PhotoFileFormat _tmp76_; #line 458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = row; + _tmp75_ = row->master; #line 458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp89_->master; + _tmp76_ = _tmp75_->file_format; #line 458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = _tmp90_->file_format; -#line 458 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp91_ != PHOTO_FILE_FORMAT_RAW) { -#line 4156 "Photo.c" - PhotoRow* _tmp92_; - BackingPhotoRow* _tmp93_; - BackingPhotoRow* _tmp94_; + if (_tmp76_ != PHOTO_FILE_FORMAT_RAW) { +#line 5178 "Photo.c" + PhotoRow* _tmp77_; + BackingPhotoRow* _tmp78_; + BackingPhotoRow* _tmp79_; #line 459 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = self->row; + _tmp77_ = self->row; #line 459 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = _tmp92_->master; + _tmp78_ = _tmp77_->master; #line 459 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = _backing_photo_row_ref0 (_tmp93_); + _tmp79_ = _backing_photo_row_ref0 (_tmp78_); #line 459 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 459 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = _tmp94_; -#line 4170 "Photo.c" + self->backing_photo_row = _tmp79_; +#line 5192 "Photo.c" } else { - GeeHashMap* _tmp95_; - PhotoRow* _tmp96_; - RawDeveloper _tmp97_; - gboolean _tmp98_; + GeeHashMap* _tmp80_; + RawDeveloper _tmp81_; #line 463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = self->priv->developments; + _tmp80_ = self->priv->developments; #line 463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = row; + _tmp81_ = row->developer; #line 463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = _tmp96_->developer; -#line 463 "/home/jens/Source/shotwell/src/Photo.vala" - _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 4186 "Photo.c" - GeeHashMap* _tmp99_; - PhotoRow* _tmp100_; - RawDeveloper _tmp101_; - gpointer _tmp102_; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp81_))) { +#line 5202 "Photo.c" + GeeHashMap* _tmp82_; + RawDeveloper _tmp83_; + gpointer _tmp84_; #line 464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = self->priv->developments; + _tmp82_ = self->priv->developments; #line 464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = row; + _tmp83_ = row->developer; #line 464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = _tmp100_->developer; -#line 464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp101_)); + _tmp84_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp83_)); #line 464 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 464 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = (BackingPhotoRow*) _tmp102_; -#line 4203 "Photo.c" + self->backing_photo_row = (BackingPhotoRow*) _tmp84_; +#line 5216 "Photo.c" } else { - PhotoRow* _tmp103_; - BackingPhotoRow* _tmp104_; - BackingPhotoRow* _tmp105_; + PhotoRow* _tmp85_; + BackingPhotoRow* _tmp86_; + BackingPhotoRow* _tmp87_; #line 467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = self->row; + _tmp85_ = self->row; #line 467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = _tmp103_->master; + _tmp86_ = _tmp85_->master; #line 467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = _backing_photo_row_ref0 (_tmp104_); + _tmp87_ = _backing_photo_row_ref0 (_tmp86_); #line 467 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 467 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = _tmp105_; -#line 4218 "Photo.c" + self->backing_photo_row = _tmp87_; +#line 5231 "Photo.c" } } } #line 471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = self->row; + _tmp88_ = self->row; #line 471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = _tmp106_->exposure_time; + _tmp89_ = _tmp88_->exposure_time; #line 471 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->cached_exposure_time = _tmp107_; + self->priv->cached_exposure_time = _tmp89_; #line 399 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (basename); #line 399 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 4232 "Photo.c" +#line 5245 "Photo.c" } -void photo_init_photo (void) { +void +photo_init_photo (void) +{ GeeLinkedList* _tmp0_; #line 475 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = gee_linked_list_new (PHOTO_TYPE_CACHED_PIXBUF, (GBoxedCopyFunc) photo_cached_pixbuf_ref, (GDestroyNotify) photo_cached_pixbuf_unref, NULL, NULL, NULL); @@ -4240,11 +5255,13 @@ 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 4244 "Photo.c" +#line 5259 "Photo.c" } -void photo_terminate_photo (void) { +void +photo_terminate_photo (void) +{ guint _tmp0_; #line 479 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo_source_pixbuf_cache); @@ -4254,7 +5271,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 4258 "Photo.c" +#line 5275 "Photo.c" guint _tmp1_; #line 482 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_discard_source_id; @@ -4262,163 +5279,186 @@ 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 4266 "Photo.c" +#line 5283 "Photo.c" } } -static void photo_real_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_file) { - GFile* _tmp0_; - GFile* _tmp1_; +static void +photo_real_notify_editable_replaced (Photo* self, + GFile* old_file, + GFile* new_file) +{ #line 487 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file)); #line 487 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file)); #line 488 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = old_file; -#line 488 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = new_file; -#line 488 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REPLACED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 4284 "Photo.c" + g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REPLACED_SIGNAL], 0, old_file, new_file); +#line 5299 "Photo.c" } -void photo_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_file) { +void +photo_notify_editable_replaced (Photo* self, + GFile* old_file, + GFile* new_file) +{ #line 487 "/home/jens/Source/shotwell/src/Photo.vala" 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 4293 "Photo.c" +#line 5312 "Photo.c" } -static void photo_real_notify_raw_development_modified (Photo* self) { +static void +photo_real_notify_raw_development_modified (Photo* self) +{ #line 492 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, photo_signals[PHOTO_RAW_DEVELOPMENT_MODIFIED_SIGNAL], 0); -#line 4300 "Photo.c" +#line 5321 "Photo.c" } -void photo_notify_raw_development_modified (Photo* self) { +void +photo_notify_raw_development_modified (Photo* self) +{ #line 491 "/home/jens/Source/shotwell/src/Photo.vala" 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 4309 "Photo.c" +#line 5332 "Photo.c" } -static void photo_real_notify_baseline_replaced (Photo* self) { +static void +photo_real_notify_baseline_replaced (Photo* self) +{ #line 496 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (self, photo_signals[PHOTO_BASELINE_REPLACED_SIGNAL], 0); -#line 4316 "Photo.c" +#line 5341 "Photo.c" } -void photo_notify_baseline_replaced (Photo* self) { +void +photo_notify_baseline_replaced (Photo* self) +{ #line 495 "/home/jens/Source/shotwell/src/Photo.vala" 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 4325 "Photo.c" +#line 5352 "Photo.c" } -static void photo_real_notify_master_reimported (Photo* self, PhotoMetadata* metadata) { - PhotoMetadata* _tmp0_; +static void +photo_real_notify_master_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 499 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 500 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 500 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, photo_signals[PHOTO_MASTER_REIMPORTED_SIGNAL], 0, _tmp0_); -#line 4337 "Photo.c" + g_signal_emit (self, photo_signals[PHOTO_MASTER_REIMPORTED_SIGNAL], 0, metadata); +#line 5364 "Photo.c" } -void photo_notify_master_reimported (Photo* self, PhotoMetadata* metadata) { +void +photo_notify_master_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 499 "/home/jens/Source/shotwell/src/Photo.vala" 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 4346 "Photo.c" +#line 5376 "Photo.c" } -static void photo_real_notify_editable_reimported (Photo* self, PhotoMetadata* metadata) { - PhotoMetadata* _tmp0_; +static void +photo_real_notify_editable_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 503 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 504 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 504 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REIMPORTED_SIGNAL], 0, _tmp0_); -#line 4358 "Photo.c" + g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REIMPORTED_SIGNAL], 0, metadata); +#line 5388 "Photo.c" } -void photo_notify_editable_reimported (Photo* self, PhotoMetadata* metadata) { +void +photo_notify_editable_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 503 "/home/jens/Source/shotwell/src/Photo.vala" 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 4367 "Photo.c" +#line 5400 "Photo.c" } -static void photo_real_notify_source_reimported (Photo* self, PhotoMetadata* metadata) { - PhotoMetadata* _tmp0_; +static void +photo_real_notify_source_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 507 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 508 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 508 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL], 0, _tmp0_); -#line 4379 "Photo.c" + g_signal_emit (self, photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL], 0, metadata); +#line 5412 "Photo.c" } -void photo_notify_source_reimported (Photo* self, PhotoMetadata* metadata) { +void +photo_notify_source_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 507 "/home/jens/Source/shotwell/src/Photo.vala" 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 4388 "Photo.c" +#line 5424 "Photo.c" } -static void photo_real_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata) { - PhotoMetadata* _tmp0_; +static void +photo_real_notify_baseline_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 511 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 512 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 512 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, photo_signals[PHOTO_BASELINE_REIMPORTED_SIGNAL], 0, _tmp0_); -#line 4400 "Photo.c" + g_signal_emit (self, photo_signals[PHOTO_BASELINE_REIMPORTED_SIGNAL], 0, metadata); +#line 5436 "Photo.c" } -void photo_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata) { +void +photo_notify_baseline_reimported (Photo* self, + PhotoMetadata* metadata) +{ #line 511 "/home/jens/Source/shotwell/src/Photo.vala" 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 4409 "Photo.c" +#line 5448 "Photo.c" } -static gboolean photo_real_internal_delete_backing (DataSource* base, GError** error) { +static gboolean +photo_real_internal_delete_backing (DataSource* base, + GError** error) +{ Photo * self; gboolean result = FALSE; gboolean ret = FALSE; GFile* file = NULL; - PhotoFileFormat _tmp8_; - GFile* _tmp12_; - gboolean _tmp24_ = FALSE; - gboolean _tmp25_ = FALSE; - gboolean _tmp26_; + GFile* _tmp11_; + gboolean _tmp22_ = FALSE; + gboolean _tmp23_ = FALSE; GError * _inner_error_ = NULL; #line 515 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); @@ -4426,14 +5466,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 4430 "Photo.c" +#line 5470 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 4437 "Photo.c" +#line 5477 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -4443,7 +5483,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 4447 "Photo.c" +#line 5487 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; GFile* _tmp5_; @@ -4457,7 +5497,7 @@ 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 4461 "Photo.c" +#line 5501 "Photo.c" } } __finally269: @@ -4467,11 +5507,11 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _tmp6_ = self->priv->readers; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 4471 "Photo.c" +#line 5511 "Photo.c" } #line 518 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4475 "Photo.c" +#line 5515 "Photo.c" gboolean _tmp7_ = FALSE; #line 518 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); @@ -4479,86 +5519,81 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e _g_object_unref0 (file); #line 518 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp7_; -#line 4483 "Photo.c" +#line 5523 "Photo.c" } } #line 523 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, TRUE, FALSE, TRUE); #line 525 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_get_master_file_format (self); -#line 525 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_ == PHOTO_FILE_FORMAT_RAW) { -#line 4492 "Photo.c" - gint _tmp9_; - RawDeveloper* _tmp10_; + if (photo_get_master_file_format (self) == PHOTO_FILE_FORMAT_RAW) { +#line 5530 "Photo.c" + gint _tmp8_; + RawDeveloper* _tmp9_; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = raw_developer_as_array (&_tmp9_); -#line 4497 "Photo.c" + _tmp9_ = raw_developer_as_array (&_tmp8_); +#line 5535 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; gint _d_collection_size_ = 0; gint d_it = 0; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection = _tmp10_; + d_collection = _tmp9_; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection_length1 = _tmp9_; + d_collection_length1 = _tmp8_; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" - for (d_it = 0; d_it < _tmp9_; d_it = d_it + 1) { -#line 4509 "Photo.c" + for (d_it = 0; d_it < _tmp8_; d_it = d_it + 1) { +#line 5547 "Photo.c" RawDeveloper d = 0; #line 526 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 4513 "Photo.c" +#line 5551 "Photo.c" { - RawDeveloper _tmp11_; + RawDeveloper _tmp10_; #line 527 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = d; + _tmp10_ = d; #line 527 "/home/jens/Source/shotwell/src/Photo.vala" - photo_delete_raw_development (self, _tmp11_); -#line 4520 "Photo.c" + photo_delete_raw_development (self, _tmp10_); +#line 5558 "Photo.c" } } #line 526 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 4525 "Photo.c" +#line 5563 "Photo.c" } } #line 531 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = file; + _tmp11_ = file; #line 531 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_ != NULL) { -#line 4532 "Photo.c" + if (_tmp11_ != NULL) { +#line 5570 "Photo.c" { - gboolean _tmp13_ = FALSE; - GFile* _tmp14_; - gboolean _tmp15_; + gboolean _tmp12_ = FALSE; + GFile* _tmp13_; #line 533 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = file; -#line 533 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = g_file_trash (_tmp14_, NULL, &_inner_error_); + _tmp13_ = file; #line 533 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp15_; + _tmp12_ = g_file_trash (_tmp13_, NULL, &_inner_error_); #line 533 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4545 "Photo.c" +#line 5580 "Photo.c" goto __catch270_g_error; } #line 533 "/home/jens/Source/shotwell/src/Photo.vala" - ret = _tmp13_; -#line 4550 "Photo.c" + ret = _tmp12_; +#line 5585 "Photo.c" } goto __finally270; __catch270_g_error: { GError* err = NULL; - GFile* _tmp16_; + GFile* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; - GError* _tmp21_; - const gchar* _tmp22_; + GError* _tmp19_; + const gchar* _tmp20_; #line 532 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 532 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4566,84 +5601,85 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e #line 535 "/home/jens/Source/shotwell/src/Photo.vala" ret = FALSE; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = file; -#line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = g_file_get_path (_tmp16_); + _tmp14_ = file; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_; + _tmp15_ = g_file_get_path (_tmp14_); #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp16_ = _tmp15_; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = err; + _tmp18_ = _tmp17_; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->message; + _tmp19_ = err; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:536: Unable to move editable %s for %s to trash: %s", _tmp18_, _tmp20_, _tmp22_); + _tmp20_ = _tmp19_->message; #line 536 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp20_); + g_message ("Photo.vala:536: Unable to move editable %s for %s to trash: %s", _tmp16_, _tmp18_, _tmp20_); #line 536 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp18_); +#line 536 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp16_); #line 532 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 4591 "Photo.c" +#line 5626 "Photo.c" } __finally270: #line 532 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4596 "Photo.c" - gboolean _tmp23_ = FALSE; +#line 5631 "Photo.c" + gboolean _tmp21_ = FALSE; #line 532 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 532 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 532 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp23_; -#line 4604 "Photo.c" + return _tmp21_; +#line 5639 "Photo.c" } } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = DATA_SOURCE_CLASS (photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); -#line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp26_; + _tmp23_ = DATA_SOURCE_CLASS (photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4613 "Photo.c" - gboolean _tmp27_ = FALSE; +#line 5646 "Photo.c" + gboolean _tmp24_ = FALSE; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp27_; -#line 4621 "Photo.c" + return _tmp24_; +#line 5654 "Photo.c" } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp25_) { -#line 4625 "Photo.c" - gboolean _tmp28_; + if (_tmp23_) { +#line 5658 "Photo.c" + gboolean _tmp25_; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = ret; + _tmp25_ = ret; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp28_; -#line 4631 "Photo.c" + _tmp22_ = _tmp25_; +#line 5664 "Photo.c" } else { #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = FALSE; -#line 4635 "Photo.c" + _tmp22_ = FALSE; +#line 5668 "Photo.c" } #line 542 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp24_; + result = _tmp22_; #line 542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 542 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4643 "Photo.c" +#line 5676 "Photo.c" } -static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) { +static BackingPhotoRow* +photo_get_backing_row (Photo* self, + BackingPhotoID* id) +{ BackingPhotoRow* result = NULL; BackingPhotoID _tmp0_; gint64 _tmp1_; @@ -4664,11 +5700,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 4668 "Photo.c" +#line 5704 "Photo.c" } #line 551 "/home/jens/Source/shotwell/src/Photo.vala" backing_row = NULL; -#line 4672 "Photo.c" +#line 5708 "Photo.c" { BackingPhotoRow* _tmp2_ = NULL; BackingPhotoTable* _tmp3_; @@ -4695,7 +5731,7 @@ 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 4699 "Photo.c" +#line 5735 "Photo.c" goto __catch271_database_error; } #line 553 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4706,7 +5742,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 4710 "Photo.c" +#line 5746 "Photo.c" } #line 553 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp2_; @@ -4718,7 +5754,7 @@ 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 4722 "Photo.c" +#line 5758 "Photo.c" } goto __finally271; __catch271_database_error: @@ -4746,7 +5782,7 @@ 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 4750 "Photo.c" +#line 5786 "Photo.c" } __finally271: #line 552 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4759,13 +5795,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 4763 "Photo.c" +#line 5799 "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 4769 "Photo.c" +#line 5805 "Photo.c" { BackingPhotoTable* _tmp14_; BackingPhotoTable* _tmp15_; @@ -4784,7 +5820,7 @@ 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 4788 "Photo.c" +#line 5824 "Photo.c" goto __catch272_database_error; } #line 560 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4795,7 +5831,7 @@ 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 4799 "Photo.c" +#line 5835 "Photo.c" } } goto __finally272; @@ -4808,7 +5844,7 @@ 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 4812 "Photo.c" +#line 5848 "Photo.c" } __finally272: #line 559 "/home/jens/Source/shotwell/src/Photo.vala" @@ -4821,7 +5857,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 4825 "Photo.c" +#line 5861 "Photo.c" } #line 564 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; @@ -4829,253 +5865,235 @@ 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 4833 "Photo.c" +#line 5869 "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 4839 "Photo.c" +#line 5875 "Photo.c" } -gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) { +gboolean +photo_is_raw_developer_complete (Photo* self, + RawDeveloper d) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 572 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 4848 "Photo.c" +#line 5887 "Photo.c" { GeeHashMap* _tmp0_; - gboolean _tmp13_ = FALSE; + gboolean _tmp9_ = FALSE; #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 4856 "Photo.c" +#line 5895 "Photo.c" { gboolean _tmp1_ = FALSE; GeeHashMap* _tmp2_; - RawDeveloper _tmp3_; - gboolean _tmp4_; #line 574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->developments; #line 574 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = d; -#line 574 "/home/jens/Source/shotwell/src/Photo.vala" - _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 4870 "Photo.c" - GeeHashMap* _tmp5_; - RawDeveloper _tmp6_; - gpointer _tmp7_; - BackingPhotoRow* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; -#line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->priv->developments; -#line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = d; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d))) { +#line 5903 "Photo.c" + GeeHashMap* _tmp3_; + gpointer _tmp4_; + BackingPhotoRow* _tmp5_; + const gchar* _tmp6_; #line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp6_)); + _tmp3_ = self->priv->developments; #line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = (BackingPhotoRow*) _tmp7_; + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d)); #line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_->filepath; + _tmp5_ = (BackingPhotoRow*) _tmp4_; #line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = g_file_test (_tmp9_, G_FILE_TEST_EXISTS); + _tmp6_ = _tmp5_->filepath; #line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp10_; + _tmp1_ = g_file_test (_tmp6_, G_FILE_TEST_EXISTS); #line 575 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp8_); -#line 4893 "Photo.c" + _backing_photo_row_unref0 (_tmp5_); +#line 5920 "Photo.c" } else { #line 574 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 4897 "Photo.c" +#line 5924 "Photo.c" } #line 574 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 4901 "Photo.c" +#line 5928 "Photo.c" { - GeeHashMap* _tmp11_; + GeeHashMap* _tmp7_; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->priv->developments; + _tmp7_ = self->priv->developments; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 4908 "Photo.c" +#line 5935 "Photo.c" } #line 574 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4912 "Photo.c" +#line 5939 "Photo.c" } __finally273: { - GeeHashMap* _tmp12_; + GeeHashMap* _tmp8_; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = self->priv->developments; + _tmp8_ = self->priv->developments; #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 4921 "Photo.c" +#line 5948 "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); #line 573 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 573 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp13_; -#line 4929 "Photo.c" + return _tmp9_; +#line 5956 "Photo.c" } } -gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) { +gboolean +photo_is_raw_developer_available (Photo* self, + RawDeveloper d) +{ gboolean result = FALSE; - RawDeveloper _tmp7_; GError * _inner_error_ = NULL; #line 580 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 4940 "Photo.c" +#line 5969 "Photo.c" { GeeHashMap* _tmp0_; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 4947 "Photo.c" +#line 5976 "Photo.c" { GeeHashMap* _tmp1_; - RawDeveloper _tmp2_; - gboolean _tmp3_; #line 582 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->developments; #line 582 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = d; -#line 582 "/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 582 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp3_) { + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d))) { #line 583 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 4962 "Photo.c" +#line 5985 "Photo.c" { - GeeHashMap* _tmp4_; + GeeHashMap* _tmp2_; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->developments; + _tmp2_ = self->priv->developments; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 4969 "Photo.c" +#line 5992 "Photo.c" } #line 583 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 4973 "Photo.c" +#line 5996 "Photo.c" } } __finally274: { - GeeHashMap* _tmp5_; + GeeHashMap* _tmp3_; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->priv->developments; + _tmp3_ = self->priv->developments; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 4983 "Photo.c" +#line 6006 "Photo.c" } #line 581 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4987 "Photo.c" - gboolean _tmp6_ = FALSE; +#line 6010 "Photo.c" + gboolean _tmp4_ = FALSE; #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 581 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 581 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp6_; -#line 4995 "Photo.c" + return _tmp4_; +#line 6018 "Photo.c" } } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = d; -#line 586 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp7_) { + switch (d) { #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_SHOTWELL: -#line 5004 "Photo.c" +#line 6025 "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 5010 "Photo.c" +#line 6031 "Photo.c" } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_CAMERA: -#line 5014 "Photo.c" +#line 6035 "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 5020 "Photo.c" +#line 6041 "Photo.c" } #line 586 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_EMBEDDED: -#line 5024 "Photo.c" +#line 6045 "Photo.c" { { PhotoMetadata* meta = NULL; - PhotoMetadata* _tmp8_; + PhotoMetadata* _tmp5_; guint num_previews = 0U; - PhotoMetadata* _tmp9_; - guint _tmp10_; - guint _tmp11_; + PhotoMetadata* _tmp6_; + guint _tmp7_; #line 595 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_get_master_metadata (self, &_inner_error_); + _tmp5_ = photo_get_master_metadata (self, &_inner_error_); #line 595 "/home/jens/Source/shotwell/src/Photo.vala" - meta = _tmp8_; + meta = _tmp5_; #line 595 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5039 "Photo.c" +#line 6059 "Photo.c" goto __catch275_g_error; } #line 596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = meta; -#line 596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_metadata_get_preview_count (_tmp9_); + _tmp6_ = meta; #line 596 "/home/jens/Source/shotwell/src/Photo.vala" - num_previews = _tmp10_; + num_previews = photo_metadata_get_preview_count (_tmp6_); #line 598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = num_previews; + _tmp7_ = num_previews; #line 598 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_ > ((guint) 0)) { -#line 5052 "Photo.c" + if (_tmp7_ > ((guint) 0)) { +#line 6070 "Photo.c" PhotoPreview* prev = NULL; - PhotoMetadata* _tmp12_; - guint _tmp13_; - PhotoPreview* _tmp14_; - PhotoPreview* _tmp15_; + PhotoMetadata* _tmp8_; + guint _tmp9_; + PhotoPreview* _tmp10_; + PhotoPreview* _tmp11_; Dimensions dims = {0}; - PhotoPreview* _tmp16_; - Dimensions _tmp17_ = {0}; - gint _tmp18_ = 0; - Dimensions _tmp19_; - gint _tmp20_; - Dimensions _tmp21_; - gint _tmp22_; + PhotoPreview* _tmp12_; + Dimensions _tmp13_ = {0}; + gint _tmp14_ = 0; + Dimensions _tmp15_; + gint _tmp16_; + Dimensions _tmp17_; + gint _tmp18_; gint preview_major_axis = 0; - gint _tmp27_; + gint _tmp23_; #line 599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = meta; + _tmp8_ = meta; #line 599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = num_previews; + _tmp9_ = num_previews; #line 599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo_metadata_get_preview (_tmp12_, _tmp13_ - 1); + _tmp10_ = photo_metadata_get_preview (_tmp8_, _tmp9_ - 1); #line 599 "/home/jens/Source/shotwell/src/Photo.vala" - prev = _tmp14_; + prev = _tmp10_; #line 602 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = prev; + _tmp11_ = prev; #line 602 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_ == NULL) { + if (_tmp11_ == NULL) { #line 603 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 603 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5084,51 +6102,51 @@ 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 5088 "Photo.c" +#line 6106 "Photo.c" } #line 605 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = prev; + _tmp12_ = prev; #line 605 "/home/jens/Source/shotwell/src/Photo.vala" - photo_preview_get_pixel_dimensions (_tmp16_, &_tmp17_); + photo_preview_get_pixel_dimensions (_tmp12_, &_tmp13_); #line 605 "/home/jens/Source/shotwell/src/Photo.vala" - dims = _tmp17_; + dims = _tmp13_; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = dims; + _tmp15_ = dims; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_.width; + _tmp16_ = _tmp15_.width; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = dims; + _tmp17_ = dims; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_.height; + _tmp18_ = _tmp17_.height; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp20_ > _tmp22_) { -#line 5106 "Photo.c" - Dimensions _tmp23_; - gint _tmp24_; + if (_tmp16_ > _tmp18_) { +#line 6124 "Photo.c" + Dimensions _tmp19_; + gint _tmp20_; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = dims; + _tmp19_ = dims; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_.width; + _tmp20_ = _tmp19_.width; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp24_; -#line 5115 "Photo.c" + _tmp14_ = _tmp20_; +#line 6133 "Photo.c" } else { - Dimensions _tmp25_; - gint _tmp26_; + Dimensions _tmp21_; + gint _tmp22_; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = dims; + _tmp21_ = dims; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_.height; + _tmp22_ = _tmp21_.height; #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp26_; -#line 5125 "Photo.c" + _tmp14_ = _tmp22_; +#line 6143 "Photo.c" } #line 608 "/home/jens/Source/shotwell/src/Photo.vala" - preview_major_axis = _tmp18_; + preview_major_axis = _tmp14_; #line 609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = preview_major_axis; + _tmp23_ = preview_major_axis; #line 609 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp27_ < PHOTO_MIN_EMBEDDED_SIZE) { + if (_tmp23_ < PHOTO_MIN_EMBEDDED_SIZE) { #line 610 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 610 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5137,7 +6155,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 5141 "Photo.c" +#line 6159 "Photo.c" } #line 613 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -5147,7 +6165,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 5151 "Photo.c" +#line 6169 "Photo.c" } #line 617 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; @@ -5155,62 +6173,65 @@ 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 5159 "Photo.c" +#line 6177 "Photo.c" } goto __finally275; __catch275_g_error: { GError* e = NULL; - GError* _tmp28_; - const gchar* _tmp29_; + GError* _tmp24_; + const gchar* _tmp25_; #line 594 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 594 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 619 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = e; + _tmp24_ = e; #line 619 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_->message; + _tmp25_ = _tmp24_->message; #line 619 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp29_); + g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp25_); #line 594 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5179 "Photo.c" +#line 6197 "Photo.c" } __finally275: #line 594 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5184 "Photo.c" - gboolean _tmp30_ = FALSE; +#line 6202 "Photo.c" + gboolean _tmp26_ = FALSE; #line 594 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 594 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 594 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp30_; -#line 5192 "Photo.c" + return _tmp26_; +#line 6210 "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 5198 "Photo.c" +#line 6216 "Photo.c" } default: { #line 624 "/home/jens/Source/shotwell/src/Photo.vala" g_assert_not_reached (); -#line 5204 "Photo.c" +#line 6222 "Photo.c" } } } -void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, gboolean notify, GError** error) { +void +photo_add_backing_photo_for_development (Photo* self, + RawDeveloper d, + BackingPhotoRow* bpr, + gboolean notify, + GError** error) +{ PhotoRow* _tmp0_; - RawDeveloper _tmp1_; - BackingPhotoRow* _tmp2_; - gboolean _tmp8_; GError * _inner_error_ = NULL; #line 631 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -5219,48 +6240,38 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi #line 632 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 632 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = d; -#line 632 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = bpr; -#line 632 "/home/jens/Source/shotwell/src/Photo.vala" - photo_import_developed_backing_photo (_tmp0_, _tmp1_, _tmp2_, &_inner_error_); + photo_import_developed_backing_photo (_tmp0_, d, bpr, &_inner_error_); #line 632 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 632 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 632 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5234 "Photo.c" +#line 6251 "Photo.c" } { - GeeHashMap* _tmp3_; + GeeHashMap* _tmp1_; #line 633 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->developments; + _tmp1_ = self->priv->developments; #line 633 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 5242 "Photo.c" +#line 6259 "Photo.c" { - GeeHashMap* _tmp4_; - RawDeveloper _tmp5_; - BackingPhotoRow* _tmp6_; -#line 634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->developments; -#line 634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = d; + GeeHashMap* _tmp2_; #line 634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = bpr; + _tmp2_ = self->priv->developments; #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 5255 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d), bpr); +#line 6266 "Photo.c" } __finally276: { - GeeHashMap* _tmp7_; + GeeHashMap* _tmp3_; #line 633 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->priv->developments; + _tmp3_ = self->priv->developments; #line 633 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 5264 "Photo.c" +#line 6275 "Photo.c" } #line 633 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5268,90 +6279,81 @@ 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 5272 "Photo.c" +#line 6283 "Photo.c" } } #line 637 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = notify; -#line 637 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { -#line 5279 "Photo.c" - Alteration* _tmp9_; - Alteration* _tmp10_; + if (notify) { +#line 6288 "Photo.c" + Alteration* _tmp4_; + Alteration* _tmp5_; #line 638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = alteration_new ("image", "developer"); + _tmp4_ = alteration_new ("image", "developer"); #line 638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_; + _tmp5_ = _tmp4_; #line 638 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp10_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_); #line 638 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp10_); -#line 5290 "Photo.c" + _alteration_unref0 (_tmp5_); +#line 6299 "Photo.c" } } -void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, BackingPhotoRow* bpr, GError** error) { +void +photo_import_developed_backing_photo (PhotoRow* row, + RawDeveloper d, + BackingPhotoRow* bpr, + GError** error) +{ GFile* file = NULL; - BackingPhotoRow* _tmp0_; - const gchar* _tmp1_; - GFile* _tmp2_; + const gchar* _tmp0_; + GFile* _tmp1_; GFileInfo* info = NULL; - GFile* _tmp3_; - GFileInfo* _tmp4_; + GFile* _tmp2_; + GFileInfo* _tmp3_; GTimeVal timestamp = {0}; - GFileInfo* _tmp5_; - GTimeVal _tmp6_ = {0}; + GFileInfo* _tmp4_; + GTimeVal _tmp5_ = {0}; PhotoFileInterrogator* interrogator = NULL; - GFile* _tmp7_; + GFile* _tmp6_; + PhotoFileInterrogator* _tmp7_; PhotoFileInterrogator* _tmp8_; - PhotoFileInterrogator* _tmp9_; DetectedPhotoInformation* detected = NULL; - PhotoFileInterrogator* _tmp10_; - DetectedPhotoInformation* _tmp11_; - gboolean _tmp12_ = FALSE; - DetectedPhotoInformation* _tmp13_; - BackingPhotoRow* _tmp16_; - DetectedPhotoInformation* _tmp17_; - Dimensions _tmp18_; - BackingPhotoRow* _tmp19_; - GFileInfo* _tmp20_; - gint64 _tmp21_; - BackingPhotoRow* _tmp22_; - GTimeVal _tmp23_; - glong _tmp24_; - Orientation _tmp25_ = 0; - DetectedPhotoInformation* _tmp26_; - PhotoMetadata* _tmp27_; - BackingPhotoRow* _tmp31_; - BackingPhotoTable* _tmp32_; - BackingPhotoTable* _tmp33_; - BackingPhotoRow* _tmp34_; - PhotoTable* _tmp35_; - PhotoTable* _tmp36_; - PhotoRow* _tmp37_; - RawDeveloper _tmp38_; - BackingPhotoRow* _tmp39_; - BackingPhotoID _tmp40_; + PhotoFileInterrogator* _tmp9_; + DetectedPhotoInformation* _tmp10_; + gboolean _tmp11_ = FALSE; + DetectedPhotoInformation* _tmp12_; + DetectedPhotoInformation* _tmp14_; + Dimensions _tmp15_; + GFileInfo* _tmp16_; + GTimeVal _tmp17_; + glong _tmp18_; + Orientation _tmp19_ = 0; + DetectedPhotoInformation* _tmp20_; + PhotoMetadata* _tmp21_; + BackingPhotoTable* _tmp24_; + BackingPhotoTable* _tmp25_; + PhotoTable* _tmp26_; + PhotoTable* _tmp27_; + BackingPhotoID _tmp28_; GError * _inner_error_ = NULL; #line 641 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO_ROW (row)); #line 641 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_BACKING_PHOTO_ROW (bpr)); #line 643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = bpr; + _tmp0_ = bpr->filepath; #line 643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp0_->filepath; + _tmp1_ = g_file_new_for_path (_tmp0_); #line 643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = g_file_new_for_path (_tmp1_); -#line 643 "/home/jens/Source/shotwell/src/Photo.vala" - file = _tmp2_; + file = _tmp1_; #line 644 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = file; + _tmp2_ = file; #line 644 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = g_file_query_info (_tmp3_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); + _tmp3_ = g_file_query_info (_tmp2_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); #line 644 "/home/jens/Source/shotwell/src/Photo.vala" - info = _tmp4_; + info = _tmp3_; #line 644 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 644 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5360,24 +6362,24 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 644 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5364 "Photo.c" +#line 6366 "Photo.c" } #line 646 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = info; + _tmp4_ = info; #line 646 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_info_get_modification_time (_tmp5_, &_tmp6_); + g_file_info_get_modification_time (_tmp4_, &_tmp5_); #line 646 "/home/jens/Source/shotwell/src/Photo.vala" - timestamp = _tmp6_; + timestamp = _tmp5_; #line 648 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = file; + _tmp6_ = file; #line 648 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_file_interrogator_new (_tmp7_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL); + _tmp7_ = photo_file_interrogator_new (_tmp6_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL); #line 648 "/home/jens/Source/shotwell/src/Photo.vala" - interrogator = _tmp8_; + interrogator = _tmp7_; #line 650 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = interrogator; + _tmp8_ = interrogator; #line 650 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_interrogator_interrogate (_tmp9_, &_inner_error_); + photo_file_interrogator_interrogate (_tmp8_, &_inner_error_); #line 650 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 650 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5390,34 +6392,31 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 650 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5394 "Photo.c" +#line 6396 "Photo.c" } #line 652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = interrogator; + _tmp9_ = interrogator; #line 652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_file_interrogator_get_detected_photo_information (_tmp10_); + _tmp10_ = photo_file_interrogator_get_detected_photo_information (_tmp9_); #line 652 "/home/jens/Source/shotwell/src/Photo.vala" - detected = _tmp11_; + detected = _tmp10_; #line 653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = detected; + _tmp12_ = detected; #line 653 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_ == NULL) { + if (_tmp12_ == NULL) { #line 653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = TRUE; -#line 5408 "Photo.c" + _tmp11_ = TRUE; +#line 6410 "Photo.c" } else { - PhotoFileInterrogator* _tmp14_; - gboolean _tmp15_; + PhotoFileInterrogator* _tmp13_; #line 653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = interrogator; + _tmp13_ = interrogator; #line 653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_interrogator_get_is_photo_corrupted (_tmp14_); -#line 653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp15_; -#line 5418 "Photo.c" + _tmp11_ = photo_file_interrogator_get_is_photo_corrupted (_tmp13_); +#line 6417 "Photo.c" } #line 653 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { + if (_tmp11_) { #line 656 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); #line 656 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5428,70 +6427,55 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 656 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5432 "Photo.c" +#line 6431 "Photo.c" } #line 659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = bpr; -#line 659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = detected; + _tmp14_ = detected; #line 659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_->image_dim; + _tmp15_ = _tmp14_->image_dim; #line 659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_->dim = _tmp18_; -#line 660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = bpr; -#line 660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = info; + bpr->dim = _tmp15_; #line 660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = g_file_info_get_size (_tmp20_); + _tmp16_ = info; #line 660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_->filesize = _tmp21_; + bpr->filesize = g_file_info_get_size (_tmp16_); #line 661 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = bpr; + _tmp17_ = timestamp; #line 661 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = timestamp; + _tmp18_ = _tmp17_.tv_sec; #line 661 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_.tv_sec; -#line 661 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_->timestamp = (time_t) _tmp24_; -#line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = detected; + bpr->timestamp = (time_t) _tmp18_; #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_->metadata; + _tmp20_ = detected; #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp27_ != NULL) { -#line 5464 "Photo.c" - DetectedPhotoInformation* _tmp28_; - PhotoMetadata* _tmp29_; - Orientation _tmp30_; + _tmp21_ = _tmp20_->metadata; #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = detected; + if (_tmp21_ != NULL) { +#line 6455 "Photo.c" + DetectedPhotoInformation* _tmp22_; + PhotoMetadata* _tmp23_; #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_->metadata; + _tmp22_ = detected; #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = photo_metadata_get_orientation (_tmp29_); + _tmp23_ = _tmp22_->metadata; #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp30_; -#line 5476 "Photo.c" + _tmp19_ = photo_metadata_get_orientation (_tmp23_); +#line 6464 "Photo.c" } else { #line 663 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = ORIENTATION_TOP_LEFT; -#line 5480 "Photo.c" + _tmp19_ = ORIENTATION_TOP_LEFT; +#line 6468 "Photo.c" } #line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = bpr; -#line 662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_->original_orientation = _tmp25_; -#line 666 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = backing_photo_table_get_instance (); + bpr->original_orientation = _tmp19_; #line 666 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_; + _tmp24_ = backing_photo_table_get_instance (); #line 666 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = bpr; + _tmp25_ = _tmp24_; #line 666 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_add (_tmp33_, _tmp34_, &_inner_error_); + backing_photo_table_add (_tmp25_, bpr, &_inner_error_); #line 666 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp33_); + _database_table_unref0 (_tmp25_); #line 666 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 666 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5506,24 +6490,18 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 666 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5510 "Photo.c" +#line 6494 "Photo.c" } #line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo_table_get_instance (); + _tmp26_ = photo_table_get_instance (); #line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _tmp35_; -#line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = row; -#line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = d; -#line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = bpr; + _tmp27_ = _tmp26_; #line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _tmp39_->id; + _tmp28_ = bpr->id; #line 667 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_update_raw_development (_tmp36_, _tmp37_, _tmp38_, &_tmp40_, &_inner_error_); + photo_table_update_raw_development (_tmp27_, row, d, &_tmp28_, &_inner_error_); #line 667 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp36_); + _database_table_unref0 (_tmp27_); #line 667 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 667 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5538,7 +6516,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (file); #line 667 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5542 "Photo.c" +#line 6520 "Photo.c" } #line 641 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); @@ -5548,14 +6526,17 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin _g_object_unref0 (info); #line 641 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 5552 "Photo.c" +#line 6530 "Photo.c" } -static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { +static void +photo_develop_photo (Photo* self, + RawDeveloper d, + gboolean notify) +{ gboolean wrote_img_to_disk = FALSE; BackingPhotoRow* bps = NULL; - RawDeveloper _tmp0_; GError * _inner_error_ = NULL; #line 672 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -5564,182 +6545,171 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 674 "/home/jens/Source/shotwell/src/Photo.vala" bps = NULL; #line 676 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = d; -#line 676 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp0_) { + switch (d) { #line 676 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_SHOTWELL: -#line 5573 "Photo.c" +#line 6552 "Photo.c" { { - BackingPhotoRow* _tmp1_ = NULL; - RawDeveloper _tmp2_; - PhotoRow* _tmp3_; + BackingPhotoRow* _tmp0_ = NULL; + PhotoRow* _tmp1_; + BackingPhotoRow* _tmp2_; + const gchar* _tmp3_; BackingPhotoRow* _tmp4_; - const gchar* _tmp5_; - BackingPhotoRow* _tmp6_; - BackingPhotoRow* _tmp7_; + BackingPhotoRow* _tmp5_; GdkPixbuf* pix = NULL; - GdkPixbuf* _tmp14_; + GdkPixbuf* _tmp12_; PhotoFileWriter* writer = NULL; - BackingPhotoRow* _tmp21_; - const gchar* _tmp22_; - PhotoFileWriter* _tmp23_; - PhotoFileWriter* _tmp24_; - GdkPixbuf* _tmp25_; + BackingPhotoRow* _tmp17_; + const gchar* _tmp18_; + PhotoFileWriter* _tmp19_; + PhotoFileWriter* _tmp20_; + GdkPixbuf* _tmp21_; PhotoMetadata* meta = NULL; - PhotoMetadata* _tmp26_; + PhotoMetadata* _tmp22_; PhotoFileMetadataWriter* mwriter = NULL; - BackingPhotoRow* _tmp27_; - const gchar* _tmp28_; - PhotoFileMetadataWriter* _tmp29_; - PhotoFileMetadataWriter* _tmp30_; - PhotoMetadata* _tmp31_; -#line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = d; + BackingPhotoRow* _tmp23_; + const gchar* _tmp24_; + PhotoFileMetadataWriter* _tmp25_; + PhotoFileMetadataWriter* _tmp26_; + PhotoMetadata* _tmp27_; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->row; + _tmp1_ = self->row; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_->master; + _tmp2_ = _tmp1_->master; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->filepath; + _tmp3_ = _tmp2_->filepath; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = raw_developer_create_backing_row_for_development (_tmp2_, _tmp5_, NULL, &_inner_error_); + _tmp4_ = raw_developer_create_backing_row_for_development (d, _tmp3_, NULL, &_inner_error_); #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp6_; + _tmp0_ = _tmp4_; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5613 "Photo.c" +#line 6589 "Photo.c" goto __catch277_g_error; } #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp1_; + _tmp5_ = _tmp0_; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = NULL; + _tmp0_ = NULL; #line 680 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); #line 680 "/home/jens/Source/shotwell/src/Photo.vala" - bps = _tmp7_; + bps = _tmp5_; #line 681 "/home/jens/Source/shotwell/src/Photo.vala" pix = NULL; -#line 5626 "Photo.c" +#line 6602 "Photo.c" { - PhotoBackingReaders* _tmp8_; + PhotoBackingReaders* _tmp6_; #line 682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->priv->readers; + _tmp6_ = self->priv->readers; #line 682 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 5633 "Photo.c" +#line 6609 "Photo.c" { - GdkPixbuf* _tmp9_ = NULL; - Scaling _tmp10_ = {0}; - GdkPixbuf* _tmp11_; - GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp7_ = NULL; + Scaling _tmp8_ = {0}; + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; #line 687 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_for_original (&_tmp10_); + scaling_for_original (&_tmp8_); #line 687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_get_master_pixbuf (self, &_tmp10_, FALSE, &_inner_error_); + _tmp9_ = photo_get_master_pixbuf (self, &_tmp8_, FALSE, &_inner_error_); #line 687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp11_; + _tmp7_ = _tmp9_; #line 687 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5647 "Photo.c" +#line 6623 "Photo.c" goto __finally278; } #line 687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp9_; + _tmp10_ = _tmp7_; #line 687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = NULL; + _tmp7_ = NULL; #line 687 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 687 "/home/jens/Source/shotwell/src/Photo.vala" - pix = _tmp12_; + pix = _tmp10_; #line 682 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp9_); -#line 5660 "Photo.c" + _g_object_unref0 (_tmp7_); +#line 6636 "Photo.c" } __finally278: { - PhotoBackingReaders* _tmp13_; + PhotoBackingReaders* _tmp11_; #line 682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->priv->readers; + _tmp11_ = self->priv->readers; #line 682 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 5669 "Photo.c" +#line 6645 "Photo.c" } #line 682 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 682 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 682 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5677 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6653 "Photo.c" goto __catch277_g_error; } } #line 690 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = pix; + _tmp12_ = pix; #line 690 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_ == NULL) { + if (_tmp12_ == NULL) { #line 691 "/home/jens/Source/shotwell/src/Photo.vala" g_debug ("Photo.vala:691: Could not get preview pixbuf"); #line 692 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 692 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5691 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6667 "Photo.c" { - gboolean _tmp15_; + gboolean _tmp13_; #line 716 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = wrote_img_to_disk; + _tmp13_ = wrote_img_to_disk; #line 716 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_) { -#line 5698 "Photo.c" + if (_tmp13_) { +#line 6674 "Photo.c" { - RawDeveloper _tmp16_; - BackingPhotoRow* _tmp17_; - gboolean _tmp18_; -#line 719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = d; -#line 719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = bps; + BackingPhotoRow* _tmp14_; #line 719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = notify; + _tmp14_ = bps; #line 719 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp16_, _tmp17_, _tmp18_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp14_, notify, &_inner_error_); #line 719 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5713 "Photo.c" +#line 6683 "Photo.c" goto __catch279_g_error; } #line 721 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 5718 "Photo.c" +#line 6688 "Photo.c" } goto __finally279; __catch279_g_error: { GError* e = NULL; - GError* _tmp19_; - const gchar* _tmp20_; + GError* _tmp15_; + const gchar* _tmp16_; #line 717 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 717 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 723 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = e; + _tmp15_ = e; #line 723 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_->message; + _tmp16_ = _tmp15_->message; #line 723 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:723: Error adding backing photo as development. Message: %s", _tmp20_); + g_debug ("Photo.vala:723: Error adding backing photo as development. Message: %s", _tmp16_); #line 717 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5738 "Photo.c" +#line 6708 "Photo.c" } __finally279: #line 717 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5743 "Photo.c" +#line 6713 "Photo.c" goto __catch277_g_error; } } @@ -5748,31 +6718,31 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _backing_photo_row_unref0 (bps); #line 692 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5752 "Photo.c" +#line 6722 "Photo.c" } #line 696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = bps; + _tmp17_ = bps; #line 696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->filepath; + _tmp18_ = _tmp17_->filepath; #line 696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp22_, &_inner_error_); + _tmp19_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp18_, &_inner_error_); #line 696 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp23_; + writer = _tmp19_; #line 696 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 696 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 696 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5768 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6738 "Photo.c" goto __catch277_g_error; } #line 697 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = writer; + _tmp20_ = writer; #line 697 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = pix; + _tmp21_ = pix; #line 697 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_writer_write (_tmp24_, _tmp25_, JPEG_QUALITY_HIGH, &_inner_error_); + photo_file_writer_write (_tmp20_, _tmp21_, JPEG_QUALITY_HIGH, &_inner_error_); #line 697 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 697 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5780,16 +6750,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 697 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 697 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5785 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6755 "Photo.c" goto __catch277_g_error; } #line 705 "/home/jens/Source/shotwell/src/Photo.vala" wrote_img_to_disk = TRUE; #line 710 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_get_master_metadata (self, &_inner_error_); + _tmp22_ = photo_get_master_metadata (self, &_inner_error_); #line 710 "/home/jens/Source/shotwell/src/Photo.vala" - meta = _tmp26_; + meta = _tmp22_; #line 710 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 710 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5797,18 +6767,18 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 710 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 710 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5802 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6772 "Photo.c" goto __catch277_g_error; } #line 711 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = bps; + _tmp23_ = bps; #line 711 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_->filepath; + _tmp24_ = _tmp23_->filepath; #line 711 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp28_, &_inner_error_); + _tmp25_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp24_, &_inner_error_); #line 711 "/home/jens/Source/shotwell/src/Photo.vala" - mwriter = _tmp29_; + mwriter = _tmp25_; #line 711 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 711 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5818,16 +6788,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 711 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 711 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5823 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6793 "Photo.c" goto __catch277_g_error; } #line 712 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = mwriter; + _tmp26_ = mwriter; #line 712 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = meta; + _tmp27_ = meta; #line 712 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp30_, _tmp31_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp26_, _tmp27_, &_inner_error_); #line 712 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 712 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5839,8 +6809,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 712 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 712 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5844 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6814 "Photo.c" goto __catch277_g_error; } #line 678 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5852,77 +6822,71 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 678 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pix); #line 678 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp1_); -#line 5857 "Photo.c" + _backing_photo_row_unref0 (_tmp0_); +#line 6827 "Photo.c" } goto __finally277; __catch277_g_error: { GError* err = NULL; - GError* _tmp32_; - const gchar* _tmp33_; + GError* _tmp28_; + const gchar* _tmp29_; #line 678 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 678 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 714 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = err; + _tmp28_ = err; #line 714 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_->message; + _tmp29_ = _tmp28_->message; #line 714 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:714: Error developing photo: %s", _tmp33_); + g_debug ("Photo.vala:714: Error developing photo: %s", _tmp29_); #line 678 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 5877 "Photo.c" +#line 6847 "Photo.c" } __finally277: { - gboolean _tmp34_; + gboolean _tmp30_; #line 716 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = wrote_img_to_disk; + _tmp30_ = wrote_img_to_disk; #line 716 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp34_) { -#line 5886 "Photo.c" + if (_tmp30_) { +#line 6856 "Photo.c" { - RawDeveloper _tmp35_; - BackingPhotoRow* _tmp36_; - gboolean _tmp37_; + BackingPhotoRow* _tmp31_; #line 719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = d; + _tmp31_ = bps; #line 719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = bps; -#line 719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = notify; -#line 719 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp35_, _tmp36_, _tmp37_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp31_, notify, &_inner_error_); #line 719 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5901 "Photo.c" +#line 6865 "Photo.c" goto __catch280_g_error; } #line 721 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 5906 "Photo.c" +#line 6870 "Photo.c" } goto __finally280; __catch280_g_error: { GError* e = NULL; - GError* _tmp38_; - const gchar* _tmp39_; + GError* _tmp32_; + const gchar* _tmp33_; #line 717 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 717 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 723 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = e; + _tmp32_ = e; #line 723 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tmp38_->message; + _tmp33_ = _tmp32_->message; #line 723 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:723: Error adding backing photo as development. Message: %s", _tmp39_); + g_debug ("Photo.vala:723: Error adding backing photo as development. Message: %s", _tmp33_); #line 717 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 5926 "Photo.c" +#line 6890 "Photo.c" } __finally280: #line 717 "/home/jens/Source/shotwell/src/Photo.vala" @@ -5935,7 +6899,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 717 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5939 "Photo.c" +#line 6903 "Photo.c" } } } @@ -5949,130 +6913,119 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 678 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 5953 "Photo.c" +#line 6917 "Photo.c" } #line 729 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 5957 "Photo.c" +#line 6921 "Photo.c" } #line 676 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_CAMERA: -#line 5961 "Photo.c" +#line 6925 "Photo.c" { #line 733 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 5965 "Photo.c" +#line 6929 "Photo.c" } #line 676 "/home/jens/Source/shotwell/src/Photo.vala" case RAW_DEVELOPER_EMBEDDED: -#line 5969 "Photo.c" +#line 6933 "Photo.c" { { PhotoMetadata* meta = NULL; - PhotoMetadata* _tmp40_; + PhotoMetadata* _tmp34_; guint c = 0U; + PhotoMetadata* _tmp35_; + guint _tmp36_; + PhotoPreview* prev = NULL; PhotoMetadata* _tmp41_; guint _tmp42_; - guint _tmp43_; - PhotoPreview* prev = NULL; - PhotoMetadata* _tmp50_; - guint _tmp51_; - PhotoPreview* _tmp52_; - PhotoPreview* _tmp53_; + PhotoPreview* _tmp43_; + PhotoPreview* _tmp44_; GBytes* pix = NULL; - PhotoPreview* _tmp60_; - GBytes* _tmp61_; - GBytes* _tmp62_; - BackingPhotoRow* _tmp69_ = NULL; - RawDeveloper _tmp70_; - PhotoRow* _tmp71_; - BackingPhotoRow* _tmp72_; - const gchar* _tmp73_; - BackingPhotoRow* _tmp74_; - BackingPhotoRow* _tmp75_; - gboolean _tmp76_ = FALSE; - GBytes* _tmp77_; - gboolean _tmp78_; + PhotoPreview* _tmp49_; + GBytes* _tmp50_; + GBytes* _tmp51_; + BackingPhotoRow* _tmp56_ = NULL; + PhotoRow* _tmp57_; + BackingPhotoRow* _tmp58_; + const gchar* _tmp59_; + BackingPhotoRow* _tmp60_; + BackingPhotoRow* _tmp61_; + gboolean _tmp62_ = FALSE; + GBytes* _tmp63_; PhotoFileMetadataWriter* mwriter = NULL; - BackingPhotoRow* _tmp100_; - const gchar* _tmp101_; - PhotoFileMetadataWriter* _tmp102_; - PhotoFileMetadataWriter* _tmp103_; - PhotoMetadata* _tmp104_; + BackingPhotoRow* _tmp83_; + const gchar* _tmp84_; + PhotoFileMetadataWriter* _tmp85_; + PhotoFileMetadataWriter* _tmp86_; + PhotoMetadata* _tmp87_; #line 738 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = photo_get_master_metadata (self, &_inner_error_); + _tmp34_ = photo_get_master_metadata (self, &_inner_error_); #line 738 "/home/jens/Source/shotwell/src/Photo.vala" - meta = _tmp40_; + meta = _tmp34_; #line 738 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6009 "Photo.c" +#line 6970 "Photo.c" goto __catch281_g_error; } #line 739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = meta; -#line 739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = photo_metadata_get_preview_count (_tmp41_); + _tmp35_ = meta; #line 739 "/home/jens/Source/shotwell/src/Photo.vala" - c = _tmp42_; + c = photo_metadata_get_preview_count (_tmp35_); #line 740 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = c; + _tmp36_ = c; #line 740 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp43_ <= ((guint) 0)) { + if (_tmp36_ <= ((guint) 0)) { #line 741 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6024 "Photo.c" +#line 6983 "Photo.c" { - gboolean _tmp44_; + gboolean _tmp37_; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = wrote_img_to_disk; + _tmp37_ = wrote_img_to_disk; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_) { -#line 6031 "Photo.c" + if (_tmp37_) { +#line 6990 "Photo.c" { - RawDeveloper _tmp45_; - BackingPhotoRow* _tmp46_; - gboolean _tmp47_; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = d; + BackingPhotoRow* _tmp38_; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = bps; + _tmp38_ = bps; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = notify; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp45_, _tmp46_, _tmp47_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp38_, notify, &_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6046 "Photo.c" +#line 6999 "Photo.c" goto __catch282_g_error; } #line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6051 "Photo.c" +#line 7004 "Photo.c" } goto __finally282; __catch282_g_error: { GError* e = NULL; - GError* _tmp48_; - const gchar* _tmp49_; + GError* _tmp39_; + const gchar* _tmp40_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = e; + _tmp39_ = e; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_->message; + _tmp40_ = _tmp39_->message; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp49_); + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp40_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6071 "Photo.c" +#line 7024 "Photo.c" } __finally282: #line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6076 "Photo.c" +#line 7029 "Photo.c" goto __catch281_g_error; } } @@ -6081,79 +7034,73 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _backing_photo_row_unref0 (bps); #line 741 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6085 "Photo.c" +#line 7038 "Photo.c" } #line 742 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = meta; + _tmp41_ = meta; #line 742 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = c; + _tmp42_ = c; #line 742 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = photo_metadata_get_preview (_tmp50_, _tmp51_ - 1); + _tmp43_ = photo_metadata_get_preview (_tmp41_, _tmp42_ - 1); #line 742 "/home/jens/Source/shotwell/src/Photo.vala" - prev = _tmp52_; + prev = _tmp43_; #line 743 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = prev; + _tmp44_ = prev; #line 743 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp53_ == NULL) { + if (_tmp44_ == NULL) { #line 744 "/home/jens/Source/shotwell/src/Photo.vala" g_debug ("Photo.vala:744: Could not get preview from metadata"); #line 745 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 745 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6105 "Photo.c" +#line 7058 "Photo.c" { - gboolean _tmp54_; + gboolean _tmp45_; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = wrote_img_to_disk; + _tmp45_ = wrote_img_to_disk; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp54_) { -#line 6112 "Photo.c" + if (_tmp45_) { +#line 7065 "Photo.c" { - RawDeveloper _tmp55_; - BackingPhotoRow* _tmp56_; - gboolean _tmp57_; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = d; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = bps; + BackingPhotoRow* _tmp46_; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = notify; + _tmp46_ = bps; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp55_, _tmp56_, _tmp57_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp46_, notify, &_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6127 "Photo.c" +#line 7074 "Photo.c" goto __catch283_g_error; } #line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6132 "Photo.c" +#line 7079 "Photo.c" } goto __finally283; __catch283_g_error: { GError* e = NULL; - GError* _tmp58_; - const gchar* _tmp59_; + GError* _tmp47_; + const gchar* _tmp48_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = e; + _tmp47_ = e; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = _tmp58_->message; + _tmp48_ = _tmp47_->message; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp59_); + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp48_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6152 "Photo.c" +#line 7099 "Photo.c" } __finally283: #line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6157 "Photo.c" +#line 7104 "Photo.c" goto __catch281_g_error; } } @@ -6162,27 +7109,27 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _backing_photo_row_unref0 (bps); #line 745 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6166 "Photo.c" +#line 7113 "Photo.c" } #line 748 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = prev; + _tmp49_ = prev; #line 748 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = photo_preview_flatten (_tmp60_, &_inner_error_); + _tmp50_ = photo_preview_flatten (_tmp49_, &_inner_error_); #line 748 "/home/jens/Source/shotwell/src/Photo.vala" - pix = _tmp61_; + pix = _tmp50_; #line 748 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 748 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 748 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6180 "Photo.c" +#line 7127 "Photo.c" goto __catch281_g_error; } #line 749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = pix; + _tmp51_ = pix; #line 749 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp62_ == NULL) { + if (_tmp51_ == NULL) { #line 750 "/home/jens/Source/shotwell/src/Photo.vala" g_debug ("Photo.vala:750: Could not get preview pixbuf"); #line 751 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6191,59 +7138,53 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _photo_preview_unref0 (prev); #line 751 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6195 "Photo.c" +#line 7142 "Photo.c" { - gboolean _tmp63_; + gboolean _tmp52_; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = wrote_img_to_disk; + _tmp52_ = wrote_img_to_disk; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp63_) { -#line 6202 "Photo.c" + if (_tmp52_) { +#line 7149 "Photo.c" { - RawDeveloper _tmp64_; - BackingPhotoRow* _tmp65_; - gboolean _tmp66_; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = d; + BackingPhotoRow* _tmp53_; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = bps; + _tmp53_ = bps; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = notify; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp64_, _tmp65_, _tmp66_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp53_, notify, &_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6217 "Photo.c" +#line 7158 "Photo.c" goto __catch284_g_error; } #line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6222 "Photo.c" +#line 7163 "Photo.c" } goto __finally284; __catch284_g_error: { GError* e = NULL; - GError* _tmp67_; - const gchar* _tmp68_; + GError* _tmp54_; + const gchar* _tmp55_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = e; + _tmp54_ = e; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = _tmp67_->message; + _tmp55_ = _tmp54_->message; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp68_); + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp55_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6242 "Photo.c" +#line 7183 "Photo.c" } __finally284: #line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6247 "Photo.c" +#line 7188 "Photo.c" goto __catch281_g_error; } } @@ -6252,20 +7193,18 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _backing_photo_row_unref0 (bps); #line 751 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6256 "Photo.c" +#line 7197 "Photo.c" } #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = d; -#line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = self->row; + _tmp57_ = self->row; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_->master; + _tmp58_ = _tmp57_->master; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = _tmp72_->filepath; + _tmp59_ = _tmp58_->filepath; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = raw_developer_create_backing_row_for_development (_tmp70_, _tmp73_, NULL, &_inner_error_); + _tmp60_ = raw_developer_create_backing_row_for_development (d, _tmp59_, NULL, &_inner_error_); #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = _tmp74_; + _tmp56_ = _tmp60_; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 755 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6274,180 +7213,172 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _photo_preview_unref0 (prev); #line 755 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6278 "Photo.c" +#line 7217 "Photo.c" goto __catch281_g_error; } #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = _tmp69_; + _tmp61_ = _tmp56_; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = NULL; + _tmp56_ = NULL; #line 755 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); #line 755 "/home/jens/Source/shotwell/src/Photo.vala" - bps = _tmp75_; + bps = _tmp61_; #line 759 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = pix; + _tmp63_ = pix; #line 759 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = jpeg_is_jpeg_bytes (_tmp77_, &_inner_error_); -#line 759 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = _tmp78_; + _tmp62_ = jpeg_is_jpeg_bytes (_tmp63_, &_inner_error_); #line 759 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 759 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 759 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 759 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 759 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6305 "Photo.c" +#line 7242 "Photo.c" goto __catch281_g_error; } #line 759 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp76_) { -#line 6310 "Photo.c" + if (_tmp62_) { +#line 7247 "Photo.c" GFile* outfile = NULL; - BackingPhotoRow* _tmp79_; - const gchar* _tmp80_; - GFile* _tmp81_; - GFile* _tmp82_; - GBytes* _tmp83_; - gsize _tmp84_; - guint8* _tmp85_; + BackingPhotoRow* _tmp64_; + const gchar* _tmp65_; + GFile* _tmp66_; + GFile* _tmp67_; + GBytes* _tmp68_; + gsize _tmp69_; + guint8* _tmp70_; #line 760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = bps; + _tmp64_ = bps; #line 760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = _tmp79_->filepath; + _tmp65_ = _tmp64_->filepath; #line 760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = g_file_new_for_path (_tmp80_); + _tmp66_ = g_file_new_for_path (_tmp65_); #line 760 "/home/jens/Source/shotwell/src/Photo.vala" - outfile = _tmp81_; + outfile = _tmp66_; #line 761 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = outfile; + _tmp67_ = outfile; #line 761 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = pix; + _tmp68_ = pix; #line 761 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = g_bytes_get_data (_tmp83_, &_tmp84_); + _tmp70_ = g_bytes_get_data (_tmp68_, &_tmp69_); #line 761 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_replace_contents (_tmp82_, _tmp85_, (gsize) _tmp84_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, &_inner_error_); + g_file_replace_contents (_tmp67_, _tmp70_, (gsize) _tmp69_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, &_inner_error_); #line 761 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 761 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (outfile); #line 761 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 761 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 761 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 761 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6347 "Photo.c" +#line 7284 "Photo.c" goto __catch281_g_error; } #line 759 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (outfile); -#line 6352 "Photo.c" +#line 7289 "Photo.c" } else { GdkPixbuf* pixbuf = NULL; - PhotoPreview* _tmp86_; - GdkPixbuf* _tmp87_; - GdkPixbuf* _tmp88_; + PhotoPreview* _tmp71_; + GdkPixbuf* _tmp72_; + GdkPixbuf* _tmp73_; PhotoFileWriter* writer = NULL; - BackingPhotoRow* _tmp95_; - const gchar* _tmp96_; - PhotoFileWriter* _tmp97_; - PhotoFileWriter* _tmp98_; - GdkPixbuf* _tmp99_; + BackingPhotoRow* _tmp78_; + const gchar* _tmp79_; + PhotoFileWriter* _tmp80_; + PhotoFileWriter* _tmp81_; + GdkPixbuf* _tmp82_; #line 764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = prev; + _tmp71_ = prev; #line 764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = photo_preview_get_pixbuf (_tmp86_, &_inner_error_); + _tmp72_ = photo_preview_get_pixbuf (_tmp71_, &_inner_error_); #line 764 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp87_; + pixbuf = _tmp72_; #line 764 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 764 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 764 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 764 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 764 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6380 "Photo.c" +#line 7317 "Photo.c" goto __catch281_g_error; } #line 765 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = pixbuf; + _tmp73_ = pixbuf; #line 765 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp88_ == NULL) { + if (_tmp73_ == NULL) { #line 766 "/home/jens/Source/shotwell/src/Photo.vala" g_debug ("Photo.vala:766: Could not get preview pixbuf"); #line 767 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 767 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 767 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 767 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 767 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6399 "Photo.c" +#line 7336 "Photo.c" { - gboolean _tmp89_; + gboolean _tmp74_; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = wrote_img_to_disk; + _tmp74_ = wrote_img_to_disk; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp89_) { -#line 6406 "Photo.c" + if (_tmp74_) { +#line 7343 "Photo.c" { - RawDeveloper _tmp90_; - BackingPhotoRow* _tmp91_; - gboolean _tmp92_; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = d; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = bps; + BackingPhotoRow* _tmp75_; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = notify; + _tmp75_ = bps; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp90_, _tmp91_, _tmp92_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp75_, notify, &_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6421 "Photo.c" +#line 7352 "Photo.c" goto __catch285_g_error; } #line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6426 "Photo.c" +#line 7357 "Photo.c" } goto __finally285; __catch285_g_error: { GError* e = NULL; - GError* _tmp93_; - const gchar* _tmp94_; + GError* _tmp76_; + const gchar* _tmp77_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = e; + _tmp76_ = e; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = _tmp93_->message; + _tmp77_ = _tmp76_->message; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp94_); + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp77_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6446 "Photo.c" +#line 7377 "Photo.c" } __finally285: #line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6451 "Photo.c" +#line 7382 "Photo.c" goto __catch281_g_error; } } @@ -6456,37 +7387,37 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _backing_photo_row_unref0 (bps); #line 767 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6460 "Photo.c" +#line 7391 "Photo.c" } #line 770 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = bps; + _tmp78_ = bps; #line 770 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = _tmp95_->filepath; + _tmp79_ = _tmp78_->filepath; #line 770 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp96_, &_inner_error_); + _tmp80_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp79_, &_inner_error_); #line 770 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp97_; + writer = _tmp80_; #line 770 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 770 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 770 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 770 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 770 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 770 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6482 "Photo.c" +#line 7413 "Photo.c" goto __catch281_g_error; } #line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = writer; + _tmp81_ = writer; #line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = pixbuf; + _tmp82_ = pixbuf; #line 771 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_writer_write (_tmp98_, _tmp99_, JPEG_QUALITY_HIGH, &_inner_error_); + photo_file_writer_write (_tmp81_, _tmp82_, JPEG_QUALITY_HIGH, &_inner_error_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 771 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6494,151 +7425,145 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { #line 771 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 771 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6505 "Photo.c" +#line 7436 "Photo.c" goto __catch281_g_error; } #line 759 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); #line 759 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); -#line 6512 "Photo.c" +#line 7443 "Photo.c" } #line 777 "/home/jens/Source/shotwell/src/Photo.vala" wrote_img_to_disk = TRUE; #line 780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = bps; + _tmp83_ = bps; #line 780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = _tmp100_->filepath; + _tmp84_ = _tmp83_->filepath; #line 780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp101_, &_inner_error_); + _tmp85_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp84_, &_inner_error_); #line 780 "/home/jens/Source/shotwell/src/Photo.vala" - mwriter = _tmp102_; + mwriter = _tmp85_; #line 780 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 780 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 780 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 780 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 780 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6534 "Photo.c" +#line 7465 "Photo.c" goto __catch281_g_error; } #line 781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = mwriter; + _tmp86_ = mwriter; #line 781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = meta; + _tmp87_ = meta; #line 781 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp103_, _tmp104_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp86_, _tmp87_, &_inner_error_); #line 781 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 781 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (mwriter); #line 781 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 781 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 781 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 781 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6555 "Photo.c" +#line 7486 "Photo.c" goto __catch281_g_error; } #line 736 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (mwriter); #line 736 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp69_); + _backing_photo_row_unref0 (_tmp56_); #line 736 "/home/jens/Source/shotwell/src/Photo.vala" _g_bytes_unref0 (pix); #line 736 "/home/jens/Source/shotwell/src/Photo.vala" _photo_preview_unref0 (prev); #line 736 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (meta); -#line 6568 "Photo.c" +#line 7499 "Photo.c" } goto __finally281; __catch281_g_error: { GError* e = NULL; - GError* _tmp105_; - const gchar* _tmp106_; + GError* _tmp88_; + const gchar* _tmp89_; #line 736 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 736 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 783 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = e; + _tmp88_ = e; #line 783 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = _tmp105_->message; + _tmp89_ = _tmp88_->message; #line 783 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:783: Error accessing embedded preview. Message: %s", _tmp106_); + g_debug ("Photo.vala:783: Error accessing embedded preview. Message: %s", _tmp89_); #line 784 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6588 "Photo.c" +#line 7519 "Photo.c" { - gboolean _tmp107_; + gboolean _tmp90_; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = wrote_img_to_disk; + _tmp90_ = wrote_img_to_disk; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp107_) { -#line 6595 "Photo.c" + if (_tmp90_) { +#line 7526 "Photo.c" { - RawDeveloper _tmp108_; - BackingPhotoRow* _tmp109_; - gboolean _tmp110_; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp108_ = d; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_ = bps; + BackingPhotoRow* _tmp91_; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_ = notify; + _tmp91_ = bps; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp108_, _tmp109_, _tmp110_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp91_, notify, &_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6610 "Photo.c" +#line 7535 "Photo.c" goto __catch286_g_error; } #line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6615 "Photo.c" +#line 7540 "Photo.c" } goto __finally286; __catch286_g_error: { GError* e = NULL; - GError* _tmp111_; - const gchar* _tmp112_; + GError* _tmp92_; + const gchar* _tmp93_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp111_ = e; + _tmp92_ = e; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_ = _tmp111_->message; + _tmp93_ = _tmp92_->message; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp112_); + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp93_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6635 "Photo.c" +#line 7560 "Photo.c" } __finally286: #line 787 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 6642 "Photo.c" +#line 7567 "Photo.c" } } } @@ -6646,56 +7571,50 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { _backing_photo_row_unref0 (bps); #line 784 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6650 "Photo.c" +#line 7575 "Photo.c" } __finally281: { - gboolean _tmp113_; + gboolean _tmp94_; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = wrote_img_to_disk; + _tmp94_ = wrote_img_to_disk; #line 786 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp113_) { -#line 6659 "Photo.c" + if (_tmp94_) { +#line 7584 "Photo.c" { - RawDeveloper _tmp114_; - BackingPhotoRow* _tmp115_; - gboolean _tmp116_; + BackingPhotoRow* _tmp95_; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = d; + _tmp95_ = bps; #line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_ = bps; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_ = notify; -#line 789 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_backing_photo_for_development (self, _tmp114_, _tmp115_, _tmp116_, &_inner_error_); + photo_add_backing_photo_for_development (self, d, _tmp95_, notify, &_inner_error_); #line 789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6674 "Photo.c" +#line 7593 "Photo.c" goto __catch287_g_error; } #line 791 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); -#line 6679 "Photo.c" +#line 7598 "Photo.c" } goto __finally287; __catch287_g_error: { GError* e = NULL; - GError* _tmp117_; - const gchar* _tmp118_; + GError* _tmp96_; + const gchar* _tmp97_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp117_ = e; + _tmp96_ = e; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_ = _tmp117_->message; + _tmp97_ = _tmp96_->message; #line 793 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp118_); + g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp97_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6699 "Photo.c" +#line 7618 "Photo.c" } __finally287: #line 787 "/home/jens/Source/shotwell/src/Photo.vala" @@ -6708,7 +7627,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 787 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6712 "Photo.c" +#line 7631 "Photo.c" } } } @@ -6722,56 +7641,56 @@ static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 736 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6726 "Photo.c" +#line 7645 "Photo.c" } #line 798 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 6730 "Photo.c" +#line 7649 "Photo.c" } default: { #line 801 "/home/jens/Source/shotwell/src/Photo.vala" g_assert_not_reached (); -#line 6736 "Photo.c" +#line 7655 "Photo.c" } } #line 672 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bps); -#line 6741 "Photo.c" +#line 7660 "Photo.c" } -void photo_set_default_raw_developer (Photo* self, RawDeveloper d) { +void +photo_set_default_raw_developer (Photo* self, + RawDeveloper d) +{ GError * _inner_error_ = NULL; #line 806 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 6749 "Photo.c" +#line 7671 "Photo.c" { PhotoRow* _tmp0_; #line 807 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 807 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 6756 "Photo.c" +#line 7678 "Photo.c" { PhotoRow* _tmp1_; - RawDeveloper _tmp2_; #line 808 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 808 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = d; -#line 808 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_->developer = _tmp2_; -#line 6766 "Photo.c" + _tmp1_->developer = d; +#line 7685 "Photo.c" } __finally288: { - PhotoRow* _tmp3_; + PhotoRow* _tmp2_; #line 807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->row; + _tmp2_ = self->row; #line 807 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 6775 "Photo.c" +#line 7694 "Photo.c" } #line 807 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -6781,196 +7700,157 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 807 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6785 "Photo.c" +#line 7704 "Photo.c" } } } -void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) { - PhotoFileFormat _tmp0_; +void +photo_set_raw_developer (Photo* self, + RawDeveloper d, + gboolean notify) +{ + gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_; - gboolean _tmp51_; GError * _inner_error_ = NULL; #line 813 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 814 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_get_master_file_format (self); -#line 814 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { + if (photo_get_master_file_format (self) != PHOTO_FILE_FORMAT_RAW) { #line 815 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6807 "Photo.c" +#line 7724 "Photo.c" } #line 820 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_CAMERA); + if (photo_is_raw_developer_available (self, RAW_DEVELOPER_CAMERA)) { #line 820 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { -#line 6813 "Photo.c" - RawDeveloper _tmp3_; -#line 820 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = d; -#line 820 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED; -#line 6819 "Photo.c" + _tmp0_ = d == RAW_DEVELOPER_EMBEDDED; +#line 7730 "Photo.c" } else { #line 820 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = FALSE; -#line 6823 "Photo.c" + _tmp0_ = FALSE; +#line 7734 "Photo.c" } #line 820 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { + if (_tmp0_) { #line 821 "/home/jens/Source/shotwell/src/Photo.vala" d = RAW_DEVELOPER_CAMERA; -#line 6829 "Photo.c" +#line 7740 "Photo.c" } #line 825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED); -#line 825 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp5_) { -#line 6835 "Photo.c" - RawDeveloper _tmp6_; -#line 825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = d; + if (!photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED)) { #line 825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp6_ != RAW_DEVELOPER_CAMERA; -#line 6841 "Photo.c" + _tmp1_ = d != RAW_DEVELOPER_CAMERA; +#line 7746 "Photo.c" } else { #line 825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = FALSE; -#line 6845 "Photo.c" + _tmp1_ = FALSE; +#line 7750 "Photo.c" } #line 825 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp4_) { + if (_tmp1_) { #line 826 "/home/jens/Source/shotwell/src/Photo.vala" d = RAW_DEVELOPER_SHOTWELL; -#line 6851 "Photo.c" +#line 7756 "Photo.c" } { - GeeHashMap* _tmp7_; + GeeHashMap* _tmp2_; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->priv->developments; + _tmp2_ = self->priv->developments; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 6859 "Photo.c" +#line 7764 "Photo.c" { RawDeveloper stale_raw_developer = 0; - PhotoRow* _tmp8_; - RawDeveloper _tmp9_; - RawDeveloper _tmp10_; - gboolean _tmp11_; - GeeHashMap* _tmp14_; - RawDeveloper _tmp15_; - gboolean _tmp16_; - PhotoRow* _tmp18_; - RawDeveloper _tmp19_; - GeeHashMap* _tmp20_; - RawDeveloper _tmp21_; - gpointer _tmp22_; - PhotoBackingReaders* _tmp23_; - BackingPhotoRow* _tmp24_; - PhotoFileFormat _tmp25_; - BackingPhotoRow* _tmp26_; - const gchar* _tmp27_; - PhotoFileReader* _tmp28_; - BackingPhotoRow* _tmp33_; - Orientation _tmp34_; - gboolean _tmp44_ = FALSE; - RawDeveloper _tmp45_; + PhotoRow* _tmp3_; + RawDeveloper _tmp4_; + GeeHashMap* _tmp5_; + PhotoRow* _tmp7_; + GeeHashMap* _tmp8_; + gpointer _tmp9_; + PhotoBackingReaders* _tmp10_; + BackingPhotoRow* _tmp11_; + PhotoFileFormat _tmp12_; + BackingPhotoRow* _tmp13_; + const gchar* _tmp14_; + PhotoFileReader* _tmp15_; + BackingPhotoRow* _tmp20_; + Orientation _tmp21_; + gboolean _tmp30_ = FALSE; + RawDeveloper _tmp31_; #line 829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->row; + _tmp3_ = self->row; #line 829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_->developer; + _tmp4_ = _tmp3_->developer; #line 829 "/home/jens/Source/shotwell/src/Photo.vala" - stale_raw_developer = _tmp9_; -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = d; -#line 832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_is_raw_developer_complete (self, _tmp10_); + stale_raw_developer = _tmp4_; #line 832 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp11_) { -#line 6896 "Photo.c" - RawDeveloper _tmp12_; - gboolean _tmp13_; + if (!photo_is_raw_developer_complete (self, d)) { #line 833 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = d; -#line 833 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = notify; -#line 833 "/home/jens/Source/shotwell/src/Photo.vala" - photo_develop_photo (self, _tmp12_, _tmp13_); -#line 6905 "Photo.c" + photo_develop_photo (self, d, notify); +#line 7793 "Photo.c" } #line 835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->priv->developments; -#line 835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = d; -#line 835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp15_)); + _tmp5_ = self->priv->developments; #line 835 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp16_) { -#line 6915 "Photo.c" + if (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d))) { +#line 7799 "Photo.c" { - GeeHashMap* _tmp17_; + GeeHashMap* _tmp6_; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = self->priv->developments; + _tmp6_ = self->priv->developments; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6922 "Photo.c" +#line 7806 "Photo.c" } #line 836 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6926 "Photo.c" +#line 7810 "Photo.c" } #line 839 "/home/jens/Source/shotwell/src/Photo.vala" photo_revert_to_master (self, FALSE); #line 842 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->row; -#line 842 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = d; + _tmp7_ = self->row; #line 842 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_->developer = _tmp19_; -#line 843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->priv->developments; + _tmp7_->developer = d; #line 843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = d; + _tmp8_ = self->priv->developments; #line 843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp21_)); + _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d)); #line 843 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 843 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = (BackingPhotoRow*) _tmp22_; + self->backing_photo_row = (BackingPhotoRow*) _tmp9_; #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = self->priv->readers; + _tmp10_ = self->priv->readers; #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = self->backing_photo_row; + _tmp11_ = self->backing_photo_row; #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_->file_format; + _tmp12_ = _tmp11_->file_format; #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = self->backing_photo_row; + _tmp13_ = self->backing_photo_row; #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_->filepath; + _tmp14_ = _tmp13_->filepath; #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = photo_file_format_create_reader (_tmp25_, _tmp27_); + _tmp15_ = photo_file_format_create_reader (_tmp12_, _tmp14_); #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp23_->developer); + _photo_file_adapter_unref0 (_tmp10_->developer); #line 844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_->developer = _tmp28_; -#line 6962 "Photo.c" + _tmp10_->developer = _tmp15_; +#line 7842 "Photo.c" { - GdkPixbuf* _tmp29_; - GdkPixbuf* _tmp30_; + GdkPixbuf* _tmp16_; + GdkPixbuf* _tmp17_; #line 847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = photo_get_prefetched_copy (self, &_inner_error_); + _tmp16_ = photo_get_prefetched_copy (self, &_inner_error_); #line 847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_; + _tmp17_ = _tmp16_; #line 847 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp30_); + _g_object_unref0 (_tmp17_); #line 847 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6974 "Photo.c" +#line 7854 "Photo.c" goto __catch290_g_error; } } @@ -6984,30 +7864,30 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) { _inner_error_ = NULL; #line 850 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 6988 "Photo.c" +#line 7868 "Photo.c" { - GeeHashMap* _tmp31_; + GeeHashMap* _tmp18_; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = self->priv->developments; + _tmp18_ = self->priv->developments; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 6995 "Photo.c" +#line 7875 "Photo.c" } #line 850 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 6999 "Photo.c" +#line 7879 "Photo.c" } __finally290: #line 846 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7004 "Photo.c" +#line 7884 "Photo.c" { - GeeHashMap* _tmp32_; + GeeHashMap* _tmp19_; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->priv->developments; + _tmp19_ = self->priv->developments; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7011 "Photo.c" +#line 7891 "Photo.c" } #line 846 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7015,41 +7895,38 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 846 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 7019 "Photo.c" +#line 7899 "Photo.c" } #line 853 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = self->backing_photo_row; + _tmp20_ = self->backing_photo_row; #line 853 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_->original_orientation; + _tmp21_ = _tmp20_->original_orientation; #line 853 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_orientation (self, _tmp34_); -#line 7027 "Photo.c" + photo_set_orientation (self, _tmp21_); +#line 7907 "Photo.c" { - PhotoTable* _tmp35_; - PhotoTable* _tmp36_; - PhotoRow* _tmp37_; - RawDeveloper _tmp38_; - BackingPhotoRow* _tmp39_; - BackingPhotoID _tmp40_; -#line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo_table_get_instance (); + PhotoTable* _tmp22_; + PhotoTable* _tmp23_; + PhotoRow* _tmp24_; + BackingPhotoRow* _tmp25_; + BackingPhotoID _tmp26_; #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _tmp35_; + _tmp22_ = photo_table_get_instance (); #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = self->row; + _tmp23_ = _tmp22_; #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = d; + _tmp24_ = self->row; #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = self->backing_photo_row; + _tmp25_ = self->backing_photo_row; #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _tmp39_->id; + _tmp26_ = _tmp25_->id; #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_update_raw_development (_tmp36_, _tmp37_, _tmp38_, &_tmp40_, &_inner_error_); + photo_table_update_raw_development (_tmp23_, _tmp24_, d, &_tmp26_, &_inner_error_); #line 856 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp36_); + _database_table_unref0 (_tmp23_); #line 856 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7053 "Photo.c" +#line 7930 "Photo.c" goto __catch291_g_error; } } @@ -7057,33 +7934,33 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) { __catch291_g_error: { GError* e = NULL; - GError* _tmp41_; - const gchar* _tmp42_; + GError* _tmp27_; + const gchar* _tmp28_; #line 855 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 855 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 858 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = e; + _tmp27_ = e; #line 858 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_->message; + _tmp28_ = _tmp27_->message; #line 858 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:858: Error updating database: %s", _tmp42_); + g_warning ("Photo.vala:858: Error updating database: %s", _tmp28_); #line 855 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 7075 "Photo.c" +#line 7952 "Photo.c" } __finally291: #line 855 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7080 "Photo.c" +#line 7957 "Photo.c" { - GeeHashMap* _tmp43_; + GeeHashMap* _tmp29_; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = self->priv->developments; + _tmp29_ = self->priv->developments; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7087 "Photo.c" +#line 7964 "Photo.c" } #line 855 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7091,49 +7968,49 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 855 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 7095 "Photo.c" +#line 7972 "Photo.c" } #line 865 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = stale_raw_developer; + _tmp31_ = stale_raw_developer; #line 865 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp45_ != RAW_DEVELOPER_CAMERA) { -#line 7101 "Photo.c" - RawDeveloper _tmp46_; - PhotoRow* _tmp47_; - RawDeveloper _tmp48_; + if (_tmp31_ != RAW_DEVELOPER_CAMERA) { +#line 7978 "Photo.c" + RawDeveloper _tmp32_; + PhotoRow* _tmp33_; + RawDeveloper _tmp34_; #line 866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = stale_raw_developer; + _tmp32_ = stale_raw_developer; #line 866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = self->row; + _tmp33_ = self->row; #line 866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp47_->developer; + _tmp34_ = _tmp33_->developer; #line 866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp46_ != _tmp48_; -#line 7113 "Photo.c" + _tmp30_ = _tmp32_ != _tmp34_; +#line 7990 "Photo.c" } else { #line 865 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = FALSE; -#line 7117 "Photo.c" + _tmp30_ = FALSE; +#line 7994 "Photo.c" } #line 865 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_) { -#line 7121 "Photo.c" - RawDeveloper _tmp49_; + if (_tmp30_) { +#line 7998 "Photo.c" + RawDeveloper _tmp35_; #line 869 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = stale_raw_developer; + _tmp35_ = stale_raw_developer; #line 869 "/home/jens/Source/shotwell/src/Photo.vala" - photo_delete_raw_development (self, _tmp49_); -#line 7127 "Photo.c" + photo_delete_raw_development (self, _tmp35_); +#line 8004 "Photo.c" } } __finally289: { - GeeHashMap* _tmp50_; + GeeHashMap* _tmp36_; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = self->priv->developments; + _tmp36_ = self->priv->developments; #line 828 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7137 "Photo.c" +#line 8014 "Photo.c" } #line 828 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -7143,33 +8020,33 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) { g_clear_error (&_inner_error_); #line 828 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 7147 "Photo.c" +#line 8024 "Photo.c" } } #line 876 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = notify; -#line 876 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp51_) { -#line 7154 "Photo.c" - Alteration* _tmp52_; - Alteration* _tmp53_; + if (notify) { +#line 8029 "Photo.c" + Alteration* _tmp37_; + Alteration* _tmp38_; #line 877 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = alteration_new ("image", "developer"); + _tmp37_ = alteration_new ("image", "developer"); #line 877 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp52_; + _tmp38_ = _tmp37_; #line 877 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp53_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp38_); #line 877 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp53_); -#line 7165 "Photo.c" + _alteration_unref0 (_tmp38_); +#line 8040 "Photo.c" } #line 878 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_prefetched (self); -#line 7169 "Photo.c" +#line 8044 "Photo.c" } -RawDeveloper photo_get_raw_developer (Photo* self) { +RawDeveloper +photo_get_raw_developer (Photo* self) +{ RawDeveloper result = 0; PhotoRow* _tmp0_; RawDeveloper _tmp1_; @@ -7183,11 +8060,14 @@ RawDeveloper photo_get_raw_developer (Photo* self) { result = _tmp1_; #line 882 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7187 "Photo.c" +#line 8064 "Photo.c" } -static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { +static gboolean +photo_delete_raw_development (Photo* self, + RawDeveloper d) +{ gboolean result = FALSE; gboolean ret = FALSE; GError * _inner_error_ = NULL; @@ -7195,125 +8075,109 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 888 "/home/jens/Source/shotwell/src/Photo.vala" ret = FALSE; -#line 7199 "Photo.c" +#line 8079 "Photo.c" { GeeHashMap* _tmp0_; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 7206 "Photo.c" +#line 8086 "Photo.c" { GeeHashMap* _tmp1_; - RawDeveloper _tmp2_; - gboolean _tmp3_; + gchar* _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; - RawDeveloper _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; BackingPhotoRow* bpr = NULL; - GeeHashMap* _tmp10_; - RawDeveloper _tmp11_; - gpointer _tmp12_; - BackingPhotoRow* _tmp13_; - const gchar* _tmp14_; - GeeHashMap* _tmp39_; - RawDeveloper _tmp40_; - gboolean _tmp41_; + GeeHashMap* _tmp7_; + gpointer _tmp8_; + BackingPhotoRow* _tmp9_; + const gchar* _tmp10_; + GeeHashMap* _tmp33_; + gboolean _tmp34_; #line 891 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->developments; #line 891 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = d; -#line 891 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_)); -#line 891 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { + if (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d))) { #line 892 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; -#line 7235 "Photo.c" +#line 8106 "Photo.c" { - GeeHashMap* _tmp4_; + GeeHashMap* _tmp2_; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->developments; + _tmp2_ = self->priv->developments; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7242 "Photo.c" +#line 8113 "Photo.c" } #line 892 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7246 "Photo.c" +#line 8117 "Photo.c" } #line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; -#line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = d; + _tmp3_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = raw_developer_to_string (_tmp7_); + _tmp4_ = _tmp3_; #line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp5_ = raw_developer_to_string (d); #line 896 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:896: Delete raw development: %s %s", _tmp6_, _tmp9_); + _tmp6_ = _tmp5_; #line 896 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp9_); + g_debug ("Photo.vala:896: Delete raw development: %s %s", _tmp4_, _tmp6_); #line 896 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp6_); +#line 896 "/home/jens/Source/shotwell/src/Photo.vala" + _g_free0 (_tmp4_); #line 897 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->priv->developments; -#line 897 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = d; + _tmp7_ = self->priv->developments; #line 897 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp11_)); + _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d)); #line 897 "/home/jens/Source/shotwell/src/Photo.vala" - bpr = (BackingPhotoRow*) _tmp12_; + bpr = (BackingPhotoRow*) _tmp8_; #line 898 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = bpr; + _tmp9_ = bpr; #line 898 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->filepath; + _tmp10_ = _tmp9_->filepath; #line 898 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_ != NULL) { -#line 7278 "Photo.c" + if (_tmp10_ != NULL) { +#line 8145 "Photo.c" GFile* f = NULL; - BackingPhotoRow* _tmp15_; - const gchar* _tmp16_; - GFile* _tmp17_; + BackingPhotoRow* _tmp11_; + const gchar* _tmp12_; + GFile* _tmp13_; #line 899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = bpr; + _tmp11_ = bpr; #line 899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_->filepath; + _tmp12_ = _tmp11_->filepath; #line 899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = g_file_new_for_path (_tmp16_); + _tmp13_ = g_file_new_for_path (_tmp12_); #line 899 "/home/jens/Source/shotwell/src/Photo.vala" - f = _tmp17_; -#line 7291 "Photo.c" + f = _tmp13_; +#line 8158 "Photo.c" { - RawDeveloper _tmp18_; #line 901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = d; -#line 901 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_ == RAW_DEVELOPER_CAMERA) { -#line 7298 "Photo.c" - GFile* _tmp19_; + if (d == RAW_DEVELOPER_CAMERA) { +#line 8162 "Photo.c" + GFile* _tmp14_; #line 902 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = f; + _tmp14_ = f; #line 902 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_trash (_tmp19_, NULL, &_inner_error_); + g_file_trash (_tmp14_, NULL, &_inner_error_); #line 902 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7306 "Photo.c" +#line 8170 "Photo.c" goto __catch293_g_error; } } else { - GFile* _tmp20_; + GFile* _tmp15_; #line 904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = f; + _tmp15_ = f; #line 904 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_delete (_tmp20_, NULL, &_inner_error_); + g_file_delete (_tmp15_, NULL, &_inner_error_); #line 904 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7317 "Photo.c" +#line 8181 "Photo.c" goto __catch293_g_error; } } @@ -7322,33 +8186,33 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { __catch293_g_error: { GError* e = NULL; - BackingPhotoRow* _tmp21_; - const gchar* _tmp22_; - GError* _tmp23_; - const gchar* _tmp24_; + BackingPhotoRow* _tmp16_; + const gchar* _tmp17_; + GError* _tmp18_; + const gchar* _tmp19_; #line 900 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 900 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 906 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = bpr; + _tmp16_ = bpr; #line 906 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->filepath; + _tmp17_ = _tmp16_->filepath; #line 906 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = e; + _tmp18_ = e; #line 906 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_->message; + _tmp19_ = _tmp18_->message; #line 906 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:906: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_); + g_warning ("Photo.vala:906: Unable to delete RAW development: %s error: %s", _tmp17_, _tmp19_); #line 900 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 7346 "Photo.c" +#line 8210 "Photo.c" } __finally293: #line 900 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7351 "Photo.c" - gboolean _tmp26_ = FALSE; +#line 8215 "Photo.c" + gboolean _tmp21_ = FALSE; #line 900 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); #line 900 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7357,68 +8221,65 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { _g_object_unref0 (f); #line 900 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7361 "Photo.c" +#line 8225 "Photo.c" { - GeeHashMap* _tmp25_; + GeeHashMap* _tmp20_; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->priv->developments; + _tmp20_ = self->priv->developments; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7368 "Photo.c" +#line 8232 "Photo.c" } #line 900 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 900 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 900 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp26_; -#line 7376 "Photo.c" + return _tmp21_; +#line 8240 "Photo.c" } #line 898 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 7380 "Photo.c" +#line 8244 "Photo.c" } { - PhotoTable* _tmp27_; - PhotoTable* _tmp28_; - PhotoRow* _tmp29_; - RawDeveloper _tmp30_; - BackingPhotoTable* _tmp31_; - BackingPhotoTable* _tmp32_; - BackingPhotoRow* _tmp33_; - BackingPhotoID _tmp34_; -#line 912 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = photo_table_get_instance (); + PhotoTable* _tmp22_; + PhotoTable* _tmp23_; + PhotoRow* _tmp24_; + BackingPhotoTable* _tmp25_; + BackingPhotoTable* _tmp26_; + BackingPhotoRow* _tmp27_; + BackingPhotoID _tmp28_; #line 912 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_; + _tmp22_ = photo_table_get_instance (); #line 912 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = self->row; + _tmp23_ = _tmp22_; #line 912 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = d; + _tmp24_ = self->row; #line 912 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_remove_development (_tmp28_, _tmp29_, _tmp30_, &_inner_error_); + photo_table_remove_development (_tmp23_, _tmp24_, d, &_inner_error_); #line 912 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp28_); + _database_table_unref0 (_tmp23_); #line 912 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7405 "Photo.c" +#line 8266 "Photo.c" goto __catch294_g_error; } #line 913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = backing_photo_table_get_instance (); + _tmp25_ = backing_photo_table_get_instance (); #line 913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_; + _tmp26_ = _tmp25_; #line 913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = bpr; + _tmp27_ = bpr; #line 913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_->id; + _tmp28_ = _tmp27_->id; #line 913 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_remove (_tmp32_, &_tmp34_, &_inner_error_); + backing_photo_table_remove (_tmp26_, &_tmp28_, &_inner_error_); #line 913 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp32_); + _database_table_unref0 (_tmp26_); #line 913 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7422 "Photo.c" +#line 8283 "Photo.c" goto __catch294_g_error; } } @@ -7426,80 +8287,78 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { __catch294_g_error: { GError* e = NULL; - GError* _tmp35_; - const gchar* _tmp36_; + GError* _tmp29_; + const gchar* _tmp30_; #line 911 "/home/jens/Source/shotwell/src/Photo.vala" e = _inner_error_; #line 911 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = e; + _tmp29_ = e; #line 915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _tmp35_->message; + _tmp30_ = _tmp29_->message; #line 915 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:915: Database error while deleting RAW development: %s", _tmp36_); + g_warning ("Photo.vala:915: Database error while deleting RAW development: %s", _tmp30_); #line 911 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (e); -#line 7444 "Photo.c" +#line 8305 "Photo.c" } __finally294: #line 911 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7449 "Photo.c" - gboolean _tmp38_ = FALSE; +#line 8310 "Photo.c" + gboolean _tmp32_ = FALSE; #line 911 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); #line 911 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7455 "Photo.c" +#line 8316 "Photo.c" { - GeeHashMap* _tmp37_; + GeeHashMap* _tmp31_; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = self->priv->developments; + _tmp31_ = self->priv->developments; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7462 "Photo.c" +#line 8323 "Photo.c" } #line 911 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 911 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 911 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp38_; -#line 7470 "Photo.c" + return _tmp32_; +#line 8331 "Photo.c" } #line 918 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = self->priv->developments; -#line 918 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = d; + _tmp33_ = self->priv->developments; #line 918 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp40_), NULL); + _tmp34_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d), NULL); #line 918 "/home/jens/Source/shotwell/src/Photo.vala" - ret = _tmp41_; + ret = _tmp34_; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 7482 "Photo.c" +#line 8341 "Photo.c" } __finally292: { - GeeHashMap* _tmp42_; + GeeHashMap* _tmp35_; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = self->priv->developments; + _tmp35_ = self->priv->developments; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7491 "Photo.c" +#line 8350 "Photo.c" } #line 890 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7495 "Photo.c" - gboolean _tmp43_ = FALSE; +#line 8354 "Photo.c" + gboolean _tmp36_ = FALSE; #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 890 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 890 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp43_; -#line 7503 "Photo.c" + return _tmp36_; +#line 8362 "Photo.c" } } #line 921 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7508,58 +8367,55 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) { result = ret; #line 922 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7512 "Photo.c" +#line 8371 "Photo.c" } -void photo_redevelop_raw (Photo* self, RawDeveloper d) { +void +photo_redevelop_raw (Photo* self, + RawDeveloper d) +{ GError * _inner_error_ = NULL; #line 926 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 7520 "Photo.c" +#line 8382 "Photo.c" { GeeHashMap* _tmp0_; #line 927 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->developments; #line 927 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_developments); -#line 7527 "Photo.c" +#line 8389 "Photo.c" { - RawDeveloper _tmp1_; RawDeveloper dev = 0; + RawDeveloper _tmp1_; RawDeveloper _tmp2_; - RawDeveloper _tmp3_; - RawDeveloper _tmp4_; -#line 928 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = d; #line 928 "/home/jens/Source/shotwell/src/Photo.vala" - photo_delete_raw_development (self, _tmp1_); -#line 929 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = d; + photo_delete_raw_development (self, d); #line 929 "/home/jens/Source/shotwell/src/Photo.vala" - dev = _tmp2_; + dev = d; #line 930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = dev; + _tmp1_ = dev; #line 930 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp3_ == RAW_DEVELOPER_CAMERA) { + if (_tmp1_ == RAW_DEVELOPER_CAMERA) { #line 931 "/home/jens/Source/shotwell/src/Photo.vala" dev = RAW_DEVELOPER_EMBEDDED; -#line 7548 "Photo.c" +#line 8404 "Photo.c" } #line 933 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = dev; + _tmp2_ = dev; #line 933 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_raw_developer (self, _tmp4_, TRUE); -#line 7554 "Photo.c" + photo_set_raw_developer (self, _tmp2_, TRUE); +#line 8410 "Photo.c" } __finally295: { - GeeHashMap* _tmp5_; + GeeHashMap* _tmp3_; #line 927 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->priv->developments; + _tmp3_ = self->priv->developments; #line 927 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_developments); -#line 7563 "Photo.c" +#line 8419 "Photo.c" } #line 927 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -7569,72 +8425,90 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) { g_clear_error (&_inner_error_); #line 927 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 7573 "Photo.c" +#line 8429 "Photo.c" } } } -static void _vala_array_add89 (BackingFileState** * array, int* length, int* size, BackingFileState* value) { +static void +_vala_array_add89 (BackingFileState** * array, + int* length, + int* size, + BackingFileState* value) +{ #line 940 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 940 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 940 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7586 "Photo.c" +#line 8447 "Photo.c" } #line 940 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 940 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7592 "Photo.c" +#line 8453 "Photo.c" } -static void _vala_array_add90 (BackingFileState** * array, int* length, int* size, BackingFileState* value) { +static void +_vala_array_add90 (BackingFileState** * array, + int* length, + int* size, + BackingFileState* value) +{ #line 942 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 942 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7603 "Photo.c" +#line 8469 "Photo.c" } #line 942 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7609 "Photo.c" +#line 8475 "Photo.c" } -static void _vala_array_add91 (BackingFileState** * array, int* length, int* size, BackingFileState* value) { +static void +_vala_array_add91 (BackingFileState** * array, + int* length, + int* size, + BackingFileState* value) +{ #line 949 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 949 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 949 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (BackingFileState*, *array, (*size) + 1); -#line 7620 "Photo.c" +#line 8491 "Photo.c" } #line 949 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 949 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 7626 "Photo.c" +#line 8497 "Photo.c" } -static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, int* result_length1) { +static BackingFileState** +photo_real_get_backing_files_state (MediaSource* base, + int* result_length1) +{ Photo * self; BackingFileState** result = NULL; BackingFileState** backing = NULL; BackingFileState** _tmp0_; gint backing_length1; gint _backing_size_; - BackingFileState** _tmp27_; - gint _tmp27__length1; + BackingFileState** _tmp24_; + gint _tmp24__length1; GError * _inner_error_ = NULL; #line 937 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); @@ -7646,14 +8520,14 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, backing_length1 = 0; #line 938 "/home/jens/Source/shotwell/src/Photo.vala" _backing_size_ = backing_length1; -#line 7650 "Photo.c" +#line 8524 "Photo.c" { PhotoRow* _tmp1_; #line 939 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 939 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 7657 "Photo.c" +#line 8531 "Photo.c" { BackingFileState** _tmp2_; gint _tmp2__length1; @@ -7662,8 +8536,6 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, PhotoRow* _tmp5_; const gchar* _tmp6_; BackingFileState* _tmp7_; - gboolean _tmp8_; - gboolean _tmp12_; #line 940 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = backing; #line 940 "/home/jens/Source/shotwell/src/Photo.vala" @@ -7681,121 +8553,114 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, #line 940 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add89 (&backing, &backing_length1, &_backing_size_, _tmp7_); #line 941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_has_editable (self); -#line 941 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { -#line 7688 "Photo.c" - BackingFileState** _tmp9_; - gint _tmp9__length1; - BackingPhotoRow* _tmp10_; - BackingFileState* _tmp11_; + if (photo_has_editable (self)) { +#line 8558 "Photo.c" + BackingFileState** _tmp8_; + gint _tmp8__length1; + BackingPhotoRow* _tmp9_; + BackingFileState* _tmp10_; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = backing; + _tmp8_ = backing; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9__length1 = backing_length1; + _tmp8__length1 = backing_length1; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->priv->editable; + _tmp9_ = self->priv->editable; #line 942 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = backing_file_state_new_from_photo_row (_tmp10_, NULL); + _tmp10_ = backing_file_state_new_from_photo_row (_tmp9_, NULL); #line 942 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add90 (&backing, &backing_length1, &_backing_size_, _tmp11_); -#line 7703 "Photo.c" + _vala_array_add90 (&backing, &backing_length1, &_backing_size_, _tmp10_); +#line 8573 "Photo.c" } #line 944 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_is_developed (self); -#line 944 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { -#line 7709 "Photo.c" + if (photo_is_developed (self)) { +#line 8577 "Photo.c" GeeCollection* dev_rows = NULL; - GeeCollection* _tmp13_; - GeeCollection* _tmp14_; + GeeCollection* _tmp11_; + GeeCollection* _tmp12_; #line 945 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_get_raw_development_photo_rows (self); + _tmp11_ = photo_get_raw_development_photo_rows (self); #line 945 "/home/jens/Source/shotwell/src/Photo.vala" - dev_rows = _tmp13_; + dev_rows = _tmp11_; #line 946 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = dev_rows; + _tmp12_ = dev_rows; #line 946 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_ != NULL) { -#line 7721 "Photo.c" + if (_tmp12_ != NULL) { +#line 8589 "Photo.c" { GeeIterator* _r_it = NULL; - GeeCollection* _tmp15_; - GeeIterator* _tmp16_; + GeeCollection* _tmp13_; + GeeIterator* _tmp14_; #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = dev_rows; + _tmp13_ = dev_rows; #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _r_it = _tmp16_; + _r_it = _tmp14_; #line 947 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 7734 "Photo.c" - GeeIterator* _tmp17_; - gboolean _tmp18_; +#line 8602 "Photo.c" + GeeIterator* _tmp15_; BackingPhotoRow* r = NULL; - GeeIterator* _tmp19_; - gpointer _tmp20_; + GeeIterator* _tmp16_; + gpointer _tmp17_; + BackingPhotoRow* _tmp18_; + const gchar* _tmp19_; + BackingFileState** _tmp20_; + gint _tmp20__length1; BackingPhotoRow* _tmp21_; - const gchar* _tmp22_; - BackingFileState** _tmp23_; - gint _tmp23__length1; - BackingPhotoRow* _tmp24_; - BackingFileState* _tmp25_; + BackingFileState* _tmp22_; #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _r_it; + _tmp15_ = _r_it; #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = gee_iterator_next (_tmp17_); -#line 947 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp18_) { + if (!gee_iterator_next (_tmp15_)) { #line 947 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 7754 "Photo.c" +#line 8619 "Photo.c" } #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _r_it; + _tmp16_ = _r_it; #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = gee_iterator_get (_tmp19_); + _tmp17_ = gee_iterator_get (_tmp16_); #line 947 "/home/jens/Source/shotwell/src/Photo.vala" - r = (BackingPhotoRow*) _tmp20_; + r = (BackingPhotoRow*) _tmp17_; #line 948 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = r; + _tmp18_ = r; #line 948 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->filepath; + _tmp19_ = _tmp18_->filepath; #line 948 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:948: adding: %s", _tmp22_); + g_debug ("Photo.vala:948: adding: %s", _tmp19_); #line 949 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = backing; + _tmp20_ = backing; #line 949 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23__length1 = backing_length1; + _tmp20__length1 = backing_length1; #line 949 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = r; + _tmp21_ = r; #line 949 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = backing_file_state_new_from_photo_row (_tmp24_, NULL); + _tmp22_ = backing_file_state_new_from_photo_row (_tmp21_, NULL); #line 949 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add91 (&backing, &backing_length1, &_backing_size_, _tmp25_); + _vala_array_add91 (&backing, &backing_length1, &_backing_size_, _tmp22_); #line 947 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (r); -#line 7780 "Photo.c" +#line 8645 "Photo.c" } #line 947 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_r_it); -#line 7784 "Photo.c" +#line 8649 "Photo.c" } } #line 944 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dev_rows); -#line 7789 "Photo.c" +#line 8654 "Photo.c" } } __finally296: { - PhotoRow* _tmp26_; + PhotoRow* _tmp23_; #line 939 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = self->row; + _tmp23_ = self->row; #line 939 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 7799 "Photo.c" +#line 8664 "Photo.c" } #line 939 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -7807,140 +8672,138 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, g_clear_error (&_inner_error_); #line 939 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7811 "Photo.c" +#line 8676 "Photo.c" } } #line 955 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = backing; + _tmp24_ = backing; #line 955 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27__length1 = backing_length1; + _tmp24__length1 = backing_length1; #line 955 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { #line 955 "/home/jens/Source/shotwell/src/Photo.vala" - *result_length1 = _tmp27__length1; -#line 7822 "Photo.c" + *result_length1 = _tmp24__length1; +#line 8687 "Photo.c" } #line 955 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp27_; + result = _tmp24_; #line 955 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7828 "Photo.c" +#line 8693 "Photo.c" } -static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode) { +static PhotoFileReader* +photo_get_backing_reader (Photo* self, + BackingFetchMode mode) +{ PhotoFileReader* result = NULL; - BackingFetchMode _tmp0_; #line 958 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 959 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = mode; -#line 959 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp0_) { + switch (mode) { #line 959 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_MASTER: -#line 7843 "Photo.c" +#line 8708 "Photo.c" { - PhotoFileReader* _tmp1_; + PhotoFileReader* _tmp0_; #line 961 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_master_reader (self); + _tmp0_ = photo_get_master_reader (self); #line 961 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp1_; + result = _tmp0_; #line 961 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7852 "Photo.c" +#line 8717 "Photo.c" } #line 959 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_BASELINE: -#line 7856 "Photo.c" +#line 8721 "Photo.c" { - PhotoFileReader* _tmp2_; + PhotoFileReader* _tmp1_; #line 964 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_get_baseline_reader (self); + _tmp1_ = photo_get_baseline_reader (self); #line 964 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp2_; + result = _tmp1_; #line 964 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7865 "Photo.c" +#line 8730 "Photo.c" } #line 959 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_SOURCE: -#line 7869 "Photo.c" +#line 8734 "Photo.c" { - PhotoFileReader* _tmp3_; + PhotoFileReader* _tmp2_; #line 967 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_source_reader (self); + _tmp2_ = photo_get_source_reader (self); #line 967 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; + result = _tmp2_; #line 967 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7878 "Photo.c" +#line 8743 "Photo.c" } #line 959 "/home/jens/Source/shotwell/src/Photo.vala" case BACKING_FETCH_MODE_UNMODIFIED: -#line 7882 "Photo.c" +#line 8747 "Photo.c" { - PhotoFileFormat _tmp4_; #line 970 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_get_master_file_format (self); -#line 970 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp4_ == PHOTO_FILE_FORMAT_RAW) { -#line 7889 "Photo.c" - PhotoFileReader* _tmp5_; + if (photo_get_master_file_format (self) == PHOTO_FILE_FORMAT_RAW) { +#line 8751 "Photo.c" + PhotoFileReader* _tmp3_; #line 971 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_get_raw_developer_reader (self); + _tmp3_ = photo_get_raw_developer_reader (self); #line 971 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp5_; + result = _tmp3_; #line 971 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7897 "Photo.c" +#line 8759 "Photo.c" } else { - PhotoFileReader* _tmp6_; + PhotoFileReader* _tmp4_; #line 973 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_get_master_reader (self); + _tmp4_ = photo_get_master_reader (self); #line 973 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp6_; + result = _tmp4_; #line 973 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7906 "Photo.c" +#line 8768 "Photo.c" } } default: { - BackingFetchMode _tmp7_; - GEnumValue* _tmp8_; + GEnumValue* _tmp5_; #line 976 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = mode; + _tmp5_ = g_enum_get_value (g_type_class_ref (TYPE_BACKING_FETCH_MODE), mode); #line 976 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_enum_get_value (g_type_class_ref (TYPE_BACKING_FETCH_MODE), _tmp7_); -#line 976 "/home/jens/Source/shotwell/src/Photo.vala" - g_error ("Photo.vala:976: Unknown backing fetch mode %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL); -#line 7919 "Photo.c" + g_error ("Photo.vala:976: Unknown backing fetch mode %s", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL); +#line 8778 "Photo.c" } } } -static gpointer _photo_file_adapter_ref0 (gpointer self) { +static gpointer +_photo_file_adapter_ref0 (gpointer self) +{ #line 982 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_file_adapter_ref (self) : NULL; -#line 7928 "Photo.c" +#line 8789 "Photo.c" } -static PhotoFileReader* photo_get_master_reader (Photo* self) { +static PhotoFileReader* +photo_get_master_reader (Photo* self) +{ PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; #line 980 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 7937 "Photo.c" +#line 8800 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 7944 "Photo.c" +#line 8807 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -7953,18 +8816,18 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) { _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); #line 982 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 7957 "Photo.c" +#line 8820 "Photo.c" { PhotoBackingReaders* _tmp4_; #line 981 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7964 "Photo.c" +#line 8827 "Photo.c" } #line 982 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 7968 "Photo.c" +#line 8831 "Photo.c" } __finally297: { @@ -7973,7 +8836,7 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) { _tmp5_ = self->priv->readers; #line 981 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 7977 "Photo.c" +#line 8840 "Photo.c" } #line 981 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7981,24 +8844,26 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) { g_clear_error (&_inner_error_); #line 981 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 7985 "Photo.c" +#line 8848 "Photo.c" } } -PhotoFileReader* photo_get_editable_reader (Photo* self) { +PhotoFileReader* +photo_get_editable_reader (Photo* self) +{ PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; #line 986 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 7995 "Photo.c" +#line 8860 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8002 "Photo.c" +#line 8867 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8011,18 +8876,18 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) { _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); #line 988 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8015 "Photo.c" +#line 8880 "Photo.c" { PhotoBackingReaders* _tmp4_; #line 987 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8022 "Photo.c" +#line 8887 "Photo.c" } #line 988 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8026 "Photo.c" +#line 8891 "Photo.c" } __finally298: { @@ -8031,7 +8896,7 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) { _tmp5_ = self->priv->readers; #line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8035 "Photo.c" +#line 8900 "Photo.c" } #line 987 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8039,24 +8904,26 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) { g_clear_error (&_inner_error_); #line 987 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8043 "Photo.c" +#line 8908 "Photo.c" } } -static PhotoFileReader* photo_get_baseline_reader (Photo* self) { +static PhotoFileReader* +photo_get_baseline_reader (Photo* self) +{ PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; #line 993 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8053 "Photo.c" +#line 8920 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8060 "Photo.c" +#line 8927 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8071,7 +8938,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp2_ = _tmp1_->editable; #line 995 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8075 "Photo.c" +#line 8942 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; PhotoFileReader* _tmp5_; @@ -8083,18 +8950,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp5_ = _photo_file_adapter_ref0 (_tmp4_); #line 996 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 8087 "Photo.c" +#line 8954 "Photo.c" { PhotoBackingReaders* _tmp6_; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->readers; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8094 "Photo.c" +#line 8961 "Photo.c" } #line 996 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8098 "Photo.c" +#line 8965 "Photo.c" } #line 998 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; @@ -8102,7 +8969,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp8_ = _tmp7_->developer; #line 998 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 8106 "Photo.c" +#line 8973 "Photo.c" PhotoBackingReaders* _tmp9_; PhotoFileReader* _tmp10_; PhotoFileReader* _tmp11_; @@ -8114,18 +8981,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp11_ = _photo_file_adapter_ref0 (_tmp10_); #line 999 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp11_; -#line 8118 "Photo.c" +#line 8985 "Photo.c" { PhotoBackingReaders* _tmp12_; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->readers; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8125 "Photo.c" +#line 8992 "Photo.c" } #line 999 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8129 "Photo.c" +#line 8996 "Photo.c" } #line 1001 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->readers; @@ -8135,18 +9002,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp15_ = _photo_file_adapter_ref0 (_tmp14_); #line 1001 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp15_; -#line 8139 "Photo.c" +#line 9006 "Photo.c" { PhotoBackingReaders* _tmp16_; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->readers; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8146 "Photo.c" +#line 9013 "Photo.c" } #line 1001 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8150 "Photo.c" +#line 9017 "Photo.c" } __finally299: { @@ -8155,7 +9022,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { _tmp17_ = self->priv->readers; #line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8159 "Photo.c" +#line 9026 "Photo.c" } #line 994 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8163,24 +9030,26 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) { g_clear_error (&_inner_error_); #line 994 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8167 "Photo.c" +#line 9034 "Photo.c" } } -static PhotoFileReader* photo_get_source_reader (Photo* self) { +static PhotoFileReader* +photo_get_source_reader (Photo* self) +{ PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; #line 1006 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8177 "Photo.c" +#line 9046 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8184 "Photo.c" +#line 9053 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8195,7 +9064,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp2_ = _tmp1_->editable; #line 1008 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8199 "Photo.c" +#line 9068 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; PhotoFileReader* _tmp5_; @@ -8207,18 +9076,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp5_ = _photo_file_adapter_ref0 (_tmp4_); #line 1009 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 8211 "Photo.c" +#line 9080 "Photo.c" { PhotoBackingReaders* _tmp6_; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->readers; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8218 "Photo.c" +#line 9087 "Photo.c" } #line 1009 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8222 "Photo.c" +#line 9091 "Photo.c" } #line 1011 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->priv->readers; @@ -8226,7 +9095,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp8_ = _tmp7_->developer; #line 1011 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ != NULL) { -#line 8230 "Photo.c" +#line 9099 "Photo.c" PhotoBackingReaders* _tmp9_; PhotoFileReader* _tmp10_; PhotoFileReader* _tmp11_; @@ -8238,18 +9107,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp11_ = _photo_file_adapter_ref0 (_tmp10_); #line 1012 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp11_; -#line 8242 "Photo.c" +#line 9111 "Photo.c" { PhotoBackingReaders* _tmp12_; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = self->priv->readers; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8249 "Photo.c" +#line 9118 "Photo.c" } #line 1012 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8253 "Photo.c" +#line 9122 "Photo.c" } #line 1014 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = self->priv->readers; @@ -8259,18 +9128,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp15_ = _photo_file_adapter_ref0 (_tmp14_); #line 1014 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp15_; -#line 8263 "Photo.c" +#line 9132 "Photo.c" { PhotoBackingReaders* _tmp16_; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = self->priv->readers; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8270 "Photo.c" +#line 9139 "Photo.c" } #line 1014 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8274 "Photo.c" +#line 9143 "Photo.c" } __finally300: { @@ -8279,7 +9148,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { _tmp17_ = self->priv->readers; #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8283 "Photo.c" +#line 9152 "Photo.c" } #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); @@ -8287,24 +9156,26 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) { g_clear_error (&_inner_error_); #line 1007 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8291 "Photo.c" +#line 9160 "Photo.c" } } -static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { +static PhotoFileReader* +photo_get_raw_developer_reader (Photo* self) +{ PhotoFileReader* result = NULL; GError * _inner_error_ = NULL; #line 1019 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8301 "Photo.c" +#line 9172 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8308 "Photo.c" +#line 9179 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8317,18 +9188,18 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { _tmp3_ = _photo_file_adapter_ref0 (_tmp2_); #line 1021 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8321 "Photo.c" +#line 9192 "Photo.c" { PhotoBackingReaders* _tmp4_; #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8328 "Photo.c" +#line 9199 "Photo.c" } #line 1021 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8332 "Photo.c" +#line 9203 "Photo.c" } __finally301: { @@ -8337,7 +9208,7 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { _tmp5_ = self->priv->readers; #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8341 "Photo.c" +#line 9212 "Photo.c" } #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8345,17 +9216,19 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) { g_clear_error (&_inner_error_); #line 1020 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8349 "Photo.c" +#line 9220 "Photo.c" } } -gboolean photo_is_developed (Photo* self) { +gboolean +photo_is_developed (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 1025 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8359 "Photo.c" +#line 9232 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp5_ = FALSE; @@ -8363,7 +9236,7 @@ gboolean photo_is_developed (Photo* self) { _tmp0_ = self->priv->readers; #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8367 "Photo.c" +#line 9240 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8373,18 +9246,18 @@ gboolean photo_is_developed (Photo* self) { _tmp2_ = _tmp1_->developer; #line 1027 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8377 "Photo.c" +#line 9250 "Photo.c" { PhotoBackingReaders* _tmp3_; #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8384 "Photo.c" +#line 9257 "Photo.c" } #line 1027 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8388 "Photo.c" +#line 9261 "Photo.c" } __finally302: { @@ -8393,7 +9266,7 @@ gboolean photo_is_developed (Photo* self) { _tmp4_ = self->priv->readers; #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8397 "Photo.c" +#line 9270 "Photo.c" } #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); @@ -8401,17 +9274,19 @@ gboolean photo_is_developed (Photo* self) { g_clear_error (&_inner_error_); #line 1026 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 8405 "Photo.c" +#line 9278 "Photo.c" } } -gboolean photo_has_editable (Photo* self) { +gboolean +photo_has_editable (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 1031 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8415 "Photo.c" +#line 9290 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp5_ = FALSE; @@ -8419,7 +9294,7 @@ gboolean photo_has_editable (Photo* self) { _tmp0_ = self->priv->readers; #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8423 "Photo.c" +#line 9298 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8429,18 +9304,18 @@ gboolean photo_has_editable (Photo* self) { _tmp2_ = _tmp1_->editable; #line 1033 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8433 "Photo.c" +#line 9308 "Photo.c" { PhotoBackingReaders* _tmp3_; #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8440 "Photo.c" +#line 9315 "Photo.c" } #line 1033 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8444 "Photo.c" +#line 9319 "Photo.c" } __finally303: { @@ -8449,7 +9324,7 @@ gboolean photo_has_editable (Photo* self) { _tmp4_ = self->priv->readers; #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8453 "Photo.c" +#line 9328 "Photo.c" } #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); @@ -8457,84 +9332,85 @@ gboolean photo_has_editable (Photo* self) { g_clear_error (&_inner_error_); #line 1032 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 8461 "Photo.c" +#line 9336 "Photo.c" } } -gboolean photo_does_master_exist (Photo* self) { +gboolean +photo_does_master_exist (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 1037 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8471 "Photo.c" +#line 9348 "Photo.c" { PhotoBackingReaders* _tmp0_; - gboolean _tmp6_ = FALSE; + gboolean _tmp5_ = FALSE; #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8479 "Photo.c" +#line 9356 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; - gboolean _tmp3_; #line 1039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; #line 1039 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; #line 1039 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1039 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; -#line 8492 "Photo.c" + result = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); +#line 9366 "Photo.c" { - PhotoBackingReaders* _tmp4_; + PhotoBackingReaders* _tmp3_; #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->readers; + _tmp3_ = self->priv->readers; #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8499 "Photo.c" +#line 9373 "Photo.c" } #line 1039 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8503 "Photo.c" +#line 9377 "Photo.c" } __finally304: { - PhotoBackingReaders* _tmp5_; + PhotoBackingReaders* _tmp4_; #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->priv->readers; + _tmp4_ = self->priv->readers; #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8512 "Photo.c" +#line 9386 "Photo.c" } #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 1038 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp6_; -#line 8520 "Photo.c" + return _tmp5_; +#line 9394 "Photo.c" } } -gboolean photo_does_editable_exist (Photo* self) { +gboolean +photo_does_editable_exist (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 1044 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8530 "Photo.c" +#line 9406 "Photo.c" { PhotoBackingReaders* _tmp0_; - gboolean _tmp9_ = FALSE; + gboolean _tmp8_ = FALSE; #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8538 "Photo.c" +#line 9414 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoBackingReaders* _tmp2_; @@ -8545,65 +9421,64 @@ gboolean photo_does_editable_exist (Photo* self) { _tmp3_ = _tmp2_->editable; #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 8549 "Photo.c" +#line 9425 "Photo.c" PhotoBackingReaders* _tmp4_; PhotoFileReader* _tmp5_; - gboolean _tmp6_; #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->editable; #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1046 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp6_; -#line 8561 "Photo.c" + _tmp1_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); +#line 9434 "Photo.c" } else { #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 8565 "Photo.c" +#line 9438 "Photo.c" } #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 8569 "Photo.c" +#line 9442 "Photo.c" { - PhotoBackingReaders* _tmp7_; + PhotoBackingReaders* _tmp6_; #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->priv->readers; + _tmp6_ = self->priv->readers; #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8576 "Photo.c" +#line 9449 "Photo.c" } #line 1046 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8580 "Photo.c" +#line 9453 "Photo.c" } __finally305: { - PhotoBackingReaders* _tmp8_; + PhotoBackingReaders* _tmp7_; #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->priv->readers; + _tmp7_ = self->priv->readers; #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8589 "Photo.c" +#line 9462 "Photo.c" } #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 1045 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp9_; -#line 8597 "Photo.c" + return _tmp8_; +#line 9470 "Photo.c" } } -gboolean photo_is_master_baseline (Photo* self) { +gboolean +photo_is_master_baseline (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 1050 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8607 "Photo.c" +#line 9482 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp5_ = FALSE; @@ -8611,7 +9486,7 @@ gboolean photo_is_master_baseline (Photo* self) { _tmp0_ = self->priv->readers; #line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8615 "Photo.c" +#line 9490 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8621,18 +9496,18 @@ gboolean photo_is_master_baseline (Photo* self) { _tmp2_ = _tmp1_->editable; #line 1052 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ == NULL; -#line 8625 "Photo.c" +#line 9500 "Photo.c" { PhotoBackingReaders* _tmp3_; #line 1051 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; #line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8632 "Photo.c" +#line 9507 "Photo.c" } #line 1052 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8636 "Photo.c" +#line 9511 "Photo.c" } __finally306: { @@ -8641,7 +9516,7 @@ gboolean photo_is_master_baseline (Photo* self) { _tmp4_ = self->priv->readers; #line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8645 "Photo.c" +#line 9520 "Photo.c" } #line 1051 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8649,32 +9524,33 @@ gboolean photo_is_master_baseline (Photo* self) { g_clear_error (&_inner_error_); #line 1051 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 8653 "Photo.c" +#line 9528 "Photo.c" } } -gboolean photo_is_master_source (Photo* self) { +gboolean +photo_is_master_source (Photo* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 1056 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 1057 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_has_editable (self); -#line 1057 "/home/jens/Source/shotwell/src/Photo.vala" - result = !_tmp0_; + result = !photo_has_editable (self); #line 1057 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8669 "Photo.c" +#line 9543 "Photo.c" } -gboolean photo_is_editable_baseline (Photo* self) { +gboolean +photo_is_editable_baseline (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 1060 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 8678 "Photo.c" +#line 9554 "Photo.c" { PhotoBackingReaders* _tmp0_; gboolean _tmp5_ = FALSE; @@ -8682,7 +9558,7 @@ gboolean photo_is_editable_baseline (Photo* self) { _tmp0_ = self->priv->readers; #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 8686 "Photo.c" +#line 9562 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -8692,18 +9568,18 @@ gboolean photo_is_editable_baseline (Photo* self) { _tmp2_ = _tmp1_->editable; #line 1062 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_ != NULL; -#line 8696 "Photo.c" +#line 9572 "Photo.c" { PhotoBackingReaders* _tmp3_; #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->readers; #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8703 "Photo.c" +#line 9579 "Photo.c" } #line 1062 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8707 "Photo.c" +#line 9583 "Photo.c" } __finally307: { @@ -8712,7 +9588,7 @@ gboolean photo_is_editable_baseline (Photo* self) { _tmp4_ = self->priv->readers; #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 8716 "Photo.c" +#line 9592 "Photo.c" } #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8720,39 +9596,40 @@ gboolean photo_is_editable_baseline (Photo* self) { g_clear_error (&_inner_error_); #line 1061 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 8724 "Photo.c" +#line 9600 "Photo.c" } } -gboolean photo_is_editable_source (Photo* self) { +gboolean +photo_is_editable_source (Photo* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 1066 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 1067 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_has_editable (self); -#line 1067 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_has_editable (self); #line 1067 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8740 "Photo.c" +#line 9615 "Photo.c" } -BackingPhotoRow* photo_get_master_photo_row (Photo* self) { +BackingPhotoRow* +photo_get_master_photo_row (Photo* self) +{ BackingPhotoRow* result = NULL; GError * _inner_error_ = NULL; #line 1070 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8749 "Photo.c" +#line 9626 "Photo.c" { PhotoRow* _tmp0_; #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8756 "Photo.c" +#line 9633 "Photo.c" { PhotoRow* _tmp1_; BackingPhotoRow* _tmp2_; @@ -8765,18 +9642,18 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) { _tmp3_ = _backing_photo_row_ref0 (_tmp2_); #line 1072 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 8769 "Photo.c" +#line 9646 "Photo.c" { PhotoRow* _tmp4_; #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8776 "Photo.c" +#line 9653 "Photo.c" } #line 1072 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8780 "Photo.c" +#line 9657 "Photo.c" } __finally308: { @@ -8785,7 +9662,7 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) { _tmp5_ = self->row; #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8789 "Photo.c" +#line 9666 "Photo.c" } #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8793,79 +9670,78 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) { g_clear_error (&_inner_error_); #line 1071 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8797 "Photo.c" +#line 9674 "Photo.c" } } -BackingPhotoRow* photo_get_editable_photo_row (Photo* self) { +BackingPhotoRow* +photo_get_editable_photo_row (Photo* self) +{ BackingPhotoRow* result = NULL; GError * _inner_error_ = NULL; #line 1076 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8807 "Photo.c" +#line 9686 "Photo.c" { PhotoRow* _tmp0_; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8814 "Photo.c" +#line 9693 "Photo.c" { PhotoRow* _tmp1_; - gboolean _tmp2_; #line 1079 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 1079 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = backing_photo_id_is_valid (&_tmp1_->editable_id); -#line 1079 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { -#line 8824 "Photo.c" + if (backing_photo_id_is_valid (&_tmp1_->editable_id)) { +#line 9700 "Photo.c" + BackingPhotoRow* _tmp2_; BackingPhotoRow* _tmp3_; - BackingPhotoRow* _tmp4_; #line 1080 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->editable; + _tmp2_ = self->priv->editable; #line 1080 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _backing_photo_row_ref0 (_tmp3_); + _tmp3_ = _backing_photo_row_ref0 (_tmp2_); #line 1080 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; -#line 8833 "Photo.c" + result = _tmp3_; +#line 9709 "Photo.c" { - PhotoRow* _tmp5_; + PhotoRow* _tmp4_; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp4_ = self->row; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8840 "Photo.c" +#line 9716 "Photo.c" } #line 1080 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8844 "Photo.c" +#line 9720 "Photo.c" } else { #line 1082 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; -#line 8848 "Photo.c" +#line 9724 "Photo.c" { - PhotoRow* _tmp6_; + PhotoRow* _tmp5_; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8855 "Photo.c" +#line 9731 "Photo.c" } #line 1082 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8859 "Photo.c" +#line 9735 "Photo.c" } } __finally309: { - PhotoRow* _tmp7_; + PhotoRow* _tmp6_; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + _tmp6_ = self->row; #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8869 "Photo.c" +#line 9745 "Photo.c" } #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8873,24 +9749,26 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) { g_clear_error (&_inner_error_); #line 1077 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8877 "Photo.c" +#line 9753 "Photo.c" } } -GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { +GeeCollection* +photo_get_raw_development_photo_rows (Photo* self) +{ GeeCollection* result = NULL; GError * _inner_error_ = NULL; #line 1086 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8887 "Photo.c" +#line 9765 "Photo.c" { PhotoRow* _tmp0_; #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8894 "Photo.c" +#line 9772 "Photo.c" { GeeCollection* _tmp1_ = NULL; GeeHashMap* _tmp2_; @@ -8898,7 +9776,7 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { _tmp2_ = self->priv->developments; #line 1088 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8902 "Photo.c" +#line 9780 "Photo.c" GeeHashMap* _tmp3_; GeeCollection* _tmp4_; GeeCollection* _tmp5_; @@ -8912,28 +9790,28 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { _g_object_unref0 (_tmp1_); #line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp5_; -#line 8916 "Photo.c" +#line 9794 "Photo.c" } else { #line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); #line 1088 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 8922 "Photo.c" +#line 9800 "Photo.c" } #line 1088 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 8926 "Photo.c" +#line 9804 "Photo.c" { PhotoRow* _tmp6_; #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->row; #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8933 "Photo.c" +#line 9811 "Photo.c" } #line 1088 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 8937 "Photo.c" +#line 9815 "Photo.c" } __finally310: { @@ -8942,7 +9820,7 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { _tmp7_ = self->row; #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 8946 "Photo.c" +#line 9824 "Photo.c" } #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -8950,24 +9828,27 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) { g_clear_error (&_inner_error_); #line 1087 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 8954 "Photo.c" +#line 9832 "Photo.c" } } -BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper d) { +BackingPhotoRow* +photo_get_raw_development_photo_row (Photo* self, + RawDeveloper d) +{ BackingPhotoRow* result = NULL; GError * _inner_error_ = NULL; #line 1092 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 8964 "Photo.c" +#line 9845 "Photo.c" { PhotoRow* _tmp0_; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 8971 "Photo.c" +#line 9852 "Photo.c" { BackingPhotoRow* _tmp1_ = NULL; GeeHashMap* _tmp2_; @@ -8975,51 +9856,48 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper _tmp2_ = self->priv->developments; #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 8979 "Photo.c" +#line 9860 "Photo.c" GeeHashMap* _tmp3_; - RawDeveloper _tmp4_; - gpointer _tmp5_; + gpointer _tmp4_; #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->developments; #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = d; -#line 1094 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp4_)); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) d)); #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = (BackingPhotoRow*) _tmp5_; -#line 8993 "Photo.c" + _tmp1_ = (BackingPhotoRow*) _tmp4_; +#line 9871 "Photo.c" } else { #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_tmp1_); #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 8999 "Photo.c" +#line 9877 "Photo.c" } #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 9003 "Photo.c" +#line 9881 "Photo.c" { - PhotoRow* _tmp6_; + PhotoRow* _tmp5_; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 9010 "Photo.c" +#line 9888 "Photo.c" } #line 1094 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9014 "Photo.c" +#line 9892 "Photo.c" } __finally311: { - PhotoRow* _tmp7_; + PhotoRow* _tmp6_; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + _tmp6_ = self->row; #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 9023 "Photo.c" +#line 9901 "Photo.c" } #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -9027,12 +9905,14 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper g_clear_error (&_inner_error_); #line 1093 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 9031 "Photo.c" +#line 9909 "Photo.c" } } -static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) { +static PhotoFileFormat* +_photo_file_format_dup (PhotoFileFormat* self) +{ PhotoFileFormat* dup; #line 1104 "/home/jens/Source/shotwell/src/Photo.vala" dup = g_new0 (PhotoFileFormat, 1); @@ -9040,18 +9920,22 @@ static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) { memcpy (dup, self, sizeof (PhotoFileFormat)); #line 1104 "/home/jens/Source/shotwell/src/Photo.vala" return dup; -#line 9044 "Photo.c" +#line 9924 "Photo.c" } -static gpointer __photo_file_format_dup0 (gpointer self) { +static gpointer +__photo_file_format_dup0 (gpointer self) +{ #line 1104 "/home/jens/Source/shotwell/src/Photo.vala" return self ? _photo_file_format_dup (self) : NULL; -#line 9051 "Photo.c" +#line 9933 "Photo.c" } -PhotoFileFormat* photo_get_editable_file_format (Photo* self) { +PhotoFileFormat* +photo_get_editable_file_format (Photo* self) +{ PhotoFileFormat* result = NULL; PhotoFileReader* reader = NULL; PhotoFileReader* _tmp0_; @@ -9075,7 +9959,7 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) { _photo_file_adapter_unref0 (reader); #line 1101 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9079 "Photo.c" +#line 9963 "Photo.c" } #line 1104 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; @@ -9089,89 +9973,86 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) { _photo_file_adapter_unref0 (reader); #line 1104 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9093 "Photo.c" +#line 9977 "Photo.c" } -PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params) { +PhotoFileFormat +photo_get_export_format_for_parameters (Photo* self, + ExportFormatParameters* params) +{ PhotoFileFormat result = 0; PhotoFileFormat _result_ = 0; - PhotoFileFormat _tmp0_; - ExportFormatParameters _tmp1_; - ExportFormatMode _tmp2_; + ExportFormatParameters _tmp0_; + ExportFormatMode _tmp1_; #line 1107 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); #line 1107 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (params != NULL, 0); #line 1108 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_file_format_get_system_default_format (); -#line 1108 "/home/jens/Source/shotwell/src/Photo.vala" - _result_ = _tmp0_; + _result_ = photo_file_format_get_system_default_format (); #line 1110 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = *params; + _tmp0_ = *params; #line 1110 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _tmp1_.mode; + _tmp1_ = _tmp0_.mode; #line 1110 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp2_) { + switch (_tmp1_) { #line 1110 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_UNMODIFIED: -#line 9119 "Photo.c" +#line 10003 "Photo.c" { - PhotoFileFormat _tmp3_; -#line 1112 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_master_file_format (self); #line 1112 "/home/jens/Source/shotwell/src/Photo.vala" - _result_ = _tmp3_; + _result_ = photo_get_master_file_format (self); #line 1113 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9128 "Photo.c" +#line 10009 "Photo.c" } #line 1110 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_CURRENT: -#line 9132 "Photo.c" +#line 10013 "Photo.c" { - PhotoFileFormat _tmp4_; -#line 1116 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_get_best_export_file_format (self); #line 1116 "/home/jens/Source/shotwell/src/Photo.vala" - _result_ = _tmp4_; + _result_ = photo_get_best_export_file_format (self); #line 1117 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9141 "Photo.c" +#line 10019 "Photo.c" } #line 1110 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_SPECIFIED: -#line 9145 "Photo.c" +#line 10023 "Photo.c" { - ExportFormatParameters _tmp5_; - PhotoFileFormat _tmp6_; + ExportFormatParameters _tmp2_; + PhotoFileFormat _tmp3_; #line 1120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = *params; + _tmp2_ = *params; #line 1120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_.specified_format; + _tmp3_ = _tmp2_.specified_format; #line 1120 "/home/jens/Source/shotwell/src/Photo.vala" - _result_ = _tmp6_; + _result_ = _tmp3_; #line 1121 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9157 "Photo.c" +#line 10035 "Photo.c" } default: { #line 1124 "/home/jens/Source/shotwell/src/Photo.vala" g_error ("Photo.vala:1124: get_export_format_for_parameters: unsupported export " \ "format mode"); -#line 9163 "Photo.c" +#line 10041 "Photo.c" } } #line 1127 "/home/jens/Source/shotwell/src/Photo.vala" result = _result_; #line 1127 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9170 "Photo.c" +#line 10048 "Photo.c" } -gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params) { +gchar* +photo_get_export_basename_for_parameters (Photo* self, + ExportFormatParameters* params) +{ gchar* result = NULL; gchar* _result_ = NULL; ExportFormatParameters _tmp0_; @@ -9191,7 +10072,7 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame switch (_tmp1_) { #line 1133 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_UNMODIFIED: -#line 9194 "Photo.c" +#line 10075 "Photo.c" { GFile* _tmp2_; GFile* _tmp3_; @@ -9210,13 +10091,13 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame _g_object_unref0 (_tmp3_); #line 1136 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 9213 "Photo.c" +#line 10094 "Photo.c" } #line 1133 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_CURRENT: #line 1133 "/home/jens/Source/shotwell/src/Photo.vala" case EXPORT_FORMAT_MODE_SPECIFIED: -#line 9219 "Photo.c" +#line 10100 "Photo.c" { ExportFormatParameters _tmp5_; PhotoFileFormat _tmp6_; @@ -9233,14 +10114,14 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame _g_free0 (_result_); #line 1140 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9236 "Photo.c" +#line 10117 "Photo.c" } default: { #line 1143 "/home/jens/Source/shotwell/src/Photo.vala" g_error ("Photo.vala:1143: get_export_basename_for_parameters: unsupported expor" \ "t format mode"); -#line 9242 "Photo.c" +#line 10123 "Photo.c" } } #line 1146 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9251,175 +10132,144 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame result = _result_; #line 1147 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9253 "Photo.c" +#line 10134 "Photo.c" } -ImportResult photo_prepare_for_import (PhotoImportParams* params) { +ImportResult +photo_prepare_for_import (PhotoImportParams* params) +{ ImportResult result = 0; GFile* file = NULL; - PhotoImportParams* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; GFileInfo* info = NULL; - GFileInfo* _tmp7_; - GFileType _tmp8_; - GFile* _tmp9_; - gboolean _tmp10_; - GFile* _tmp14_; - gboolean _tmp15_; + GFileInfo* _tmp6_; + GFile* _tmp7_; + GFile* _tmp11_; GTimeVal timestamp = {0}; - GFileInfo* _tmp19_; - GTimeVal _tmp20_ = {0}; - gboolean _tmp21_ = FALSE; - gboolean _tmp22_ = FALSE; - PhotoImportParams* _tmp23_; - const gchar* _tmp24_; + GFileInfo* _tmp15_; + GTimeVal _tmp16_ = {0}; + gboolean _tmp17_ = FALSE; + gboolean _tmp18_ = FALSE; + const gchar* _tmp19_; PhotoFileInterrogator* interrogator = NULL; - GFile* _tmp32_; - PhotoImportParams* _tmp33_; - PhotoFileSnifferOptions _tmp34_; - PhotoFileInterrogator* _tmp35_; - PhotoFileInterrogator* _tmp42_; - gboolean _tmp43_; + GFile* _tmp23_; + PhotoFileSnifferOptions _tmp24_; + PhotoFileInterrogator* _tmp25_; + PhotoFileInterrogator* _tmp32_; DetectedPhotoInformation* detected = NULL; - PhotoFileInterrogator* _tmp44_; - DetectedPhotoInformation* _tmp45_; - gboolean _tmp46_ = FALSE; - DetectedPhotoInformation* _tmp47_; - PhotoImportParams* _tmp50_; - PhotoFileSnifferOptions _tmp51_; + PhotoFileInterrogator* _tmp33_; + DetectedPhotoInformation* _tmp34_; + gboolean _tmp35_ = FALSE; + DetectedPhotoInformation* _tmp36_; + PhotoFileSnifferOptions _tmp39_; Orientation orientation = 0; time_t exposure_time = 0; gchar* title = NULL; - gchar* _tmp64_; + gchar* _tmp49_; gchar* comment = NULL; - gchar* _tmp65_; + gchar* _tmp50_; Rating rating = 0; - DetectedPhotoInformation* _tmp66_; - PhotoMetadata* _tmp67_; - gboolean _tmp90_ = FALSE; - gboolean _tmp91_ = FALSE; - DetectedPhotoInformation* _tmp92_; - GdkColorspace _tmp93_; - PhotoImportParams* _tmp101_; + DetectedPhotoInformation* _tmp51_; + PhotoMetadata* _tmp52_; + gboolean _tmp71_ = FALSE; + gboolean _tmp72_ = FALSE; + DetectedPhotoInformation* _tmp73_; + GdkColorspace _tmp74_; + PhotoRow* _tmp82_; + PhotoRow* _tmp83_; + BackingPhotoRow* _tmp84_; + GFile* _tmp85_; + gchar* _tmp86_; + PhotoRow* _tmp87_; + BackingPhotoRow* _tmp88_; + DetectedPhotoInformation* _tmp89_; + Dimensions _tmp90_; + PhotoRow* _tmp91_; + BackingPhotoRow* _tmp92_; + GFileInfo* _tmp93_; + PhotoRow* _tmp94_; + BackingPhotoRow* _tmp95_; + GTimeVal _tmp96_; + glong _tmp97_; + PhotoRow* _tmp98_; + time_t _tmp99_; + PhotoRow* _tmp100_; + Orientation _tmp101_; PhotoRow* _tmp102_; - PhotoImportParams* _tmp103_; - PhotoRow* _tmp104_; - BackingPhotoRow* _tmp105_; - GFile* _tmp106_; - gchar* _tmp107_; - PhotoImportParams* _tmp108_; + BackingPhotoRow* _tmp103_; + Orientation _tmp104_; + PhotoRow* _tmp105_; + ImportID _tmp106_; + PhotoRow* _tmp107_; + PhotoRow* _tmp108_; PhotoRow* _tmp109_; - BackingPhotoRow* _tmp110_; - DetectedPhotoInformation* _tmp111_; - Dimensions _tmp112_; - PhotoImportParams* _tmp113_; - PhotoRow* _tmp114_; - BackingPhotoRow* _tmp115_; - GFileInfo* _tmp116_; - gint64 _tmp117_; - PhotoImportParams* _tmp118_; - PhotoRow* _tmp119_; - BackingPhotoRow* _tmp120_; - GTimeVal _tmp121_; - glong _tmp122_; - PhotoImportParams* _tmp123_; - PhotoRow* _tmp124_; - time_t _tmp125_; - PhotoImportParams* _tmp126_; + DetectedPhotoInformation* _tmp110_; + const gchar* _tmp111_; + gchar* _tmp112_; + PhotoRow* _tmp113_; + DetectedPhotoInformation* _tmp114_; + const gchar* _tmp115_; + gchar* _tmp116_; + PhotoRow* _tmp117_; + DetectedPhotoInformation* _tmp118_; + const gchar* _tmp119_; + gchar* _tmp120_; + PhotoRow* _tmp121_; + PhotoRow* _tmp122_; + PhotoRow* _tmp123_; + BackingPhotoRow* _tmp124_; + DetectedPhotoInformation* _tmp125_; + PhotoFileFormat _tmp126_; PhotoRow* _tmp127_; - Orientation _tmp128_; - PhotoImportParams* _tmp129_; + const gchar* _tmp128_; + gchar* _tmp129_; PhotoRow* _tmp130_; - BackingPhotoRow* _tmp131_; - Orientation _tmp132_; - PhotoImportParams* _tmp133_; - PhotoRow* _tmp134_; - PhotoImportParams* _tmp135_; - ImportID _tmp136_; - PhotoImportParams* _tmp137_; - PhotoRow* _tmp138_; - PhotoImportParams* _tmp139_; - PhotoRow* _tmp140_; - PhotoImportParams* _tmp141_; - PhotoRow* _tmp142_; - DetectedPhotoInformation* _tmp143_; - const gchar* _tmp144_; - gchar* _tmp145_; - PhotoImportParams* _tmp146_; - PhotoRow* _tmp147_; - DetectedPhotoInformation* _tmp148_; - const gchar* _tmp149_; - gchar* _tmp150_; - PhotoImportParams* _tmp151_; - PhotoRow* _tmp152_; - DetectedPhotoInformation* _tmp153_; - const gchar* _tmp154_; - gchar* _tmp155_; - PhotoImportParams* _tmp156_; - PhotoRow* _tmp157_; - PhotoImportParams* _tmp158_; - PhotoRow* _tmp159_; - PhotoImportParams* _tmp160_; - PhotoRow* _tmp161_; - BackingPhotoRow* _tmp162_; - DetectedPhotoInformation* _tmp163_; - PhotoFileFormat _tmp164_; - PhotoImportParams* _tmp165_; - PhotoRow* _tmp166_; - const gchar* _tmp167_; - gchar* _tmp168_; - PhotoImportParams* _tmp169_; - PhotoRow* _tmp170_; - const gchar* _tmp171_; - gchar* _tmp172_; - PhotoImportParams* _tmp173_; - PhotoRow* _tmp174_; - Rating _tmp175_; - PhotoImportParams* _tmp176_; - Thumbnails* _tmp177_; + const gchar* _tmp131_; + gchar* _tmp132_; + PhotoRow* _tmp133_; + Rating _tmp134_; + Thumbnails* _tmp135_; GError * _inner_error_ = NULL; #line 1162 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0); #line 1166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = params; + _tmp0_ = params->file; #line 1166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp0_->file; -#line 1166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 1166 "/home/jens/Source/shotwell/src/Photo.vala" - file = _tmp2_; + file = _tmp1_; #line 1168 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 9394 "Photo.c" +#line 10244 "Photo.c" { - GFileInfo* _tmp3_ = NULL; - GFile* _tmp4_; + GFileInfo* _tmp2_ = NULL; + GFile* _tmp3_; + GFileInfo* _tmp4_; GFileInfo* _tmp5_; - GFileInfo* _tmp6_; #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = file; + _tmp3_ = file; #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = g_file_query_info (_tmp4_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); + _tmp4_ = g_file_query_info (_tmp3_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp5_; + _tmp2_ = _tmp4_; #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9408 "Photo.c" +#line 10258 "Photo.c" goto __catch312_g_error; } #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp3_; + _tmp5_ = _tmp2_; #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = NULL; + _tmp2_ = NULL; #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); #line 1170 "/home/jens/Source/shotwell/src/Photo.vala" - info = _tmp6_; + info = _tmp5_; #line 1169 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); -#line 9421 "Photo.c" + _g_object_unref0 (_tmp2_); +#line 10271 "Photo.c" } goto __finally312; __catch312_g_error: @@ -9439,7 +10289,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1173 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9441 "Photo.c" +#line 10291 "Photo.c" } __finally312: #line 1169 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9454,14 +10304,12 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { g_clear_error (&_inner_error_); #line 1169 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 9456 "Photo.c" +#line 10306 "Photo.c" } #line 1176 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = info; -#line 1176 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_file_info_get_file_type (_tmp7_); + _tmp6_ = info; #line 1176 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_ != G_FILE_TYPE_REGULAR) { + if (g_file_info_get_file_type (_tmp6_) != G_FILE_TYPE_REGULAR) { #line 1177 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_NOT_A_FILE; #line 1177 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9470,28 +10318,26 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1177 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9472 "Photo.c" +#line 10320 "Photo.c" } #line 1179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = file; -#line 1179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_is_file_image (_tmp9_); + _tmp7_ = file; #line 1179 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp10_) { -#line 9480 "Photo.c" - GFile* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; + if (!photo_is_file_image (_tmp7_)) { +#line 10326 "Photo.c" + GFile* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 1180 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = file; + _tmp8_ = file; #line 1180 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = g_file_get_path (_tmp11_); + _tmp9_ = g_file_get_path (_tmp8_); #line 1180 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 1180 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:1180: Not importing %s: Not an image file", _tmp13_); + g_message ("Photo.vala:1180: Not importing %s: Not an image file", _tmp10_); #line 1180 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp10_); #line 1182 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_NOT_AN_IMAGE; #line 1182 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9500,28 +10346,26 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1182 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9502 "Photo.c" +#line 10348 "Photo.c" } #line 1185 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = file; -#line 1185 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_format_is_file_supported (_tmp14_); + _tmp11_ = file; #line 1185 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp15_) { -#line 9510 "Photo.c" - GFile* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; + if (!photo_file_format_is_file_supported (_tmp11_)) { +#line 10354 "Photo.c" + GFile* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; #line 1186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = file; + _tmp12_ = file; #line 1186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = g_file_get_path (_tmp16_); + _tmp13_ = g_file_get_path (_tmp12_); #line 1186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 1186 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:1186: Not importing %s: Unsupported extension", _tmp18_); + g_message ("Photo.vala:1186: Not importing %s: Unsupported extension", _tmp14_); #line 1186 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp14_); #line 1188 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; #line 1188 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9530,88 +10374,72 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1188 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9532 "Photo.c" +#line 10376 "Photo.c" } #line 1191 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = info; + _tmp15_ = info; #line 1191 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_info_get_modification_time (_tmp19_, &_tmp20_); + g_file_info_get_modification_time (_tmp15_, &_tmp16_); #line 1191 "/home/jens/Source/shotwell/src/Photo.vala" - timestamp = _tmp20_; -#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = params; + timestamp = _tmp16_; #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_->exif_md5; + _tmp19_ = params->exif_md5; #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp24_ != NULL) { -#line 9546 "Photo.c" - PhotoImportParams* _tmp25_; - const gchar* _tmp26_; -#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = params; + if (_tmp19_ != NULL) { +#line 10388 "Photo.c" + const gchar* _tmp20_; #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_->thumbnail_md5; + _tmp20_ = params->thumbnail_md5; #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp26_ != NULL; -#line 9555 "Photo.c" + _tmp18_ = _tmp20_ != NULL; +#line 10394 "Photo.c" } else { #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = FALSE; -#line 9559 "Photo.c" + _tmp18_ = FALSE; +#line 10398 "Photo.c" } #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_) { -#line 9563 "Photo.c" - PhotoImportParams* _tmp27_; - const gchar* _tmp28_; -#line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = params; + if (_tmp18_) { +#line 10402 "Photo.c" + const gchar* _tmp21_; #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_->full_md5; + _tmp21_ = params->full_md5; #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp28_ != NULL; -#line 9572 "Photo.c" + _tmp17_ = _tmp21_ != NULL; +#line 10408 "Photo.c" } else { #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = FALSE; -#line 9576 "Photo.c" + _tmp17_ = FALSE; +#line 10412 "Photo.c" } #line 1194 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_) { -#line 9580 "Photo.c" - PhotoImportParams* _tmp29_; - PhotoImportParams* _tmp30_; - PhotoFileSnifferOptions _tmp31_; -#line 1195 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = params; -#line 1195 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = params; + if (_tmp17_) { +#line 10416 "Photo.c" + PhotoFileSnifferOptions _tmp22_; #line 1195 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp30_->sniffer_options; + _tmp22_ = params->sniffer_options; #line 1195 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_->sniffer_options = _tmp31_ | PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5; -#line 9592 "Photo.c" + params->sniffer_options = _tmp22_ | PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5; +#line 10422 "Photo.c" } #line 1198 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = file; -#line 1198 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = params; + _tmp23_ = file; #line 1198 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_->sniffer_options; + _tmp24_ = params->sniffer_options; #line 1198 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo_file_interrogator_new (_tmp32_, _tmp34_); + _tmp25_ = photo_file_interrogator_new (_tmp23_, _tmp24_); #line 1198 "/home/jens/Source/shotwell/src/Photo.vala" - interrogator = _tmp35_; -#line 9604 "Photo.c" + interrogator = _tmp25_; +#line 10432 "Photo.c" { - PhotoFileInterrogator* _tmp36_; + PhotoFileInterrogator* _tmp26_; #line 1200 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = interrogator; + _tmp26_ = interrogator; #line 1200 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_interrogator_interrogate (_tmp36_, &_inner_error_); + photo_file_interrogator_interrogate (_tmp26_, &_inner_error_); #line 1200 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9613 "Photo.c" +#line 10441 "Photo.c" goto __catch313_g_error; } } @@ -9619,29 +10447,29 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { __catch313_g_error: { GError* err = NULL; - GFile* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - GError* _tmp40_; - const gchar* _tmp41_; + GFile* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + GError* _tmp30_; + const gchar* _tmp31_; #line 1199 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1199 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = file; + _tmp27_ = file; #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = g_file_get_path (_tmp37_); + _tmp28_ = g_file_get_path (_tmp27_); #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tmp38_; + _tmp29_ = _tmp28_; #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = err; + _tmp30_ = err; #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_->message; + _tmp31_ = _tmp30_->message; #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1202: Unable to interrogate photo file %s: %s", _tmp39_, _tmp41_); + g_warning ("Photo.vala:1202: Unable to interrogate photo file %s: %s", _tmp29_, _tmp31_); #line 1202 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp29_); #line 1204 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_DECODE_ERROR; #line 1204 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9654,7 +10482,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1204 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9656 "Photo.c" +#line 10484 "Photo.c" } __finally313: #line 1199 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9671,14 +10499,12 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { g_clear_error (&_inner_error_); #line 1199 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 9673 "Photo.c" +#line 10501 "Photo.c" } #line 1207 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = interrogator; + _tmp32_ = interrogator; #line 1207 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = photo_file_interrogator_get_is_photo_corrupted (_tmp42_); -#line 1207 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp43_) { + if (photo_file_interrogator_get_is_photo_corrupted (_tmp32_)) { #line 1208 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_NOT_AN_IMAGE; #line 1208 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9689,34 +10515,34 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1208 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9691 "Photo.c" +#line 10517 "Photo.c" } #line 1211 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = interrogator; + _tmp33_ = interrogator; #line 1211 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = photo_file_interrogator_get_detected_photo_information (_tmp44_); + _tmp34_ = photo_file_interrogator_get_detected_photo_information (_tmp33_); #line 1211 "/home/jens/Source/shotwell/src/Photo.vala" - detected = _tmp45_; + detected = _tmp34_; #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = detected; + _tmp36_ = detected; #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp47_ == NULL) { + if (_tmp36_ == NULL) { #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = TRUE; -#line 9705 "Photo.c" + _tmp35_ = TRUE; +#line 10531 "Photo.c" } else { - DetectedPhotoInformation* _tmp48_; - PhotoFileFormat _tmp49_; + DetectedPhotoInformation* _tmp37_; + PhotoFileFormat _tmp38_; #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = detected; + _tmp37_ = detected; #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_->file_format; + _tmp38_ = _tmp37_->file_format; #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = _tmp49_ == PHOTO_FILE_FORMAT_UNKNOWN; -#line 9715 "Photo.c" + _tmp35_ = _tmp38_ == PHOTO_FILE_FORMAT_UNKNOWN; +#line 10541 "Photo.c" } #line 1212 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp46_) { + if (_tmp35_) { #line 1213 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; #line 1213 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9729,234 +10555,211 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1213 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9731 "Photo.c" +#line 10557 "Photo.c" } #line 1216 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = params; + _tmp39_ = params->sniffer_options; #line 1216 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _tmp50_->sniffer_options; -#line 1216 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp51_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) != 0) { -#line 9739 "Photo.c" - DetectedPhotoInformation* _tmp52_; - PhotoImportParams* _tmp53_; - const gchar* _tmp54_; - gchar* _tmp55_; - DetectedPhotoInformation* _tmp56_; - PhotoImportParams* _tmp57_; - const gchar* _tmp58_; - gchar* _tmp59_; - DetectedPhotoInformation* _tmp60_; - PhotoImportParams* _tmp61_; - const gchar* _tmp62_; - gchar* _tmp63_; -#line 1217 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = detected; + if ((_tmp39_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) != 0) { +#line 10563 "Photo.c" + DetectedPhotoInformation* _tmp40_; + const gchar* _tmp41_; + gchar* _tmp42_; + DetectedPhotoInformation* _tmp43_; + const gchar* _tmp44_; + gchar* _tmp45_; + DetectedPhotoInformation* _tmp46_; + const gchar* _tmp47_; + gchar* _tmp48_; #line 1217 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = params; + _tmp40_ = detected; #line 1217 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = _tmp53_->exif_md5; + _tmp41_ = params->exif_md5; #line 1217 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = g_strdup (_tmp54_); + _tmp42_ = g_strdup (_tmp41_); #line 1217 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp52_->exif_md5); + _g_free0 (_tmp40_->exif_md5); #line 1217 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_->exif_md5 = _tmp55_; -#line 1218 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = detected; + _tmp40_->exif_md5 = _tmp42_; #line 1218 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = params; + _tmp43_ = detected; #line 1218 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _tmp57_->thumbnail_md5; + _tmp44_ = params->thumbnail_md5; #line 1218 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = g_strdup (_tmp58_); + _tmp45_ = g_strdup (_tmp44_); #line 1218 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp56_->thumbnail_md5); + _g_free0 (_tmp43_->thumbnail_md5); #line 1218 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_->thumbnail_md5 = _tmp59_; -#line 1219 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = detected; + _tmp43_->thumbnail_md5 = _tmp45_; #line 1219 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = params; + _tmp46_ = detected; #line 1219 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = _tmp61_->full_md5; + _tmp47_ = params->full_md5; #line 1219 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = g_strdup (_tmp62_); + _tmp48_ = g_strdup (_tmp47_); #line 1219 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp60_->md5); + _g_free0 (_tmp46_->md5); #line 1219 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_->md5 = _tmp63_; -#line 9788 "Photo.c" + _tmp46_->md5 = _tmp48_; +#line 10603 "Photo.c" } #line 1222 "/home/jens/Source/shotwell/src/Photo.vala" orientation = ORIENTATION_TOP_LEFT; #line 1223 "/home/jens/Source/shotwell/src/Photo.vala" exposure_time = (time_t) 0; #line 1224 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = g_strdup (""); + _tmp49_ = g_strdup (""); #line 1224 "/home/jens/Source/shotwell/src/Photo.vala" - title = _tmp64_; + title = _tmp49_; #line 1225 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = g_strdup (""); + _tmp50_ = g_strdup (""); #line 1225 "/home/jens/Source/shotwell/src/Photo.vala" - comment = _tmp65_; + comment = _tmp50_; #line 1226 "/home/jens/Source/shotwell/src/Photo.vala" rating = RATING_UNRATED; #line 1233 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = detected; + _tmp51_ = detected; #line 1233 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = _tmp66_->metadata; + _tmp52_ = _tmp51_->metadata; #line 1233 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp67_ != NULL) { -#line 9810 "Photo.c" + if (_tmp52_ != NULL) { +#line 10625 "Photo.c" MetadataDateTime* date_time = NULL; - DetectedPhotoInformation* _tmp68_; - PhotoMetadata* _tmp69_; - MetadataDateTime* _tmp70_; - MetadataDateTime* _tmp71_; - DetectedPhotoInformation* _tmp74_; - PhotoMetadata* _tmp75_; - Orientation _tmp76_; - DetectedPhotoInformation* _tmp77_; - PhotoMetadata* _tmp78_; - gchar* _tmp79_; - DetectedPhotoInformation* _tmp80_; - PhotoMetadata* _tmp81_; - gchar* _tmp82_; - PhotoImportParams* _tmp83_; - DetectedPhotoInformation* _tmp84_; - PhotoMetadata* _tmp85_; - GeeSet* _tmp86_; - DetectedPhotoInformation* _tmp87_; - PhotoMetadata* _tmp88_; - Rating _tmp89_; + DetectedPhotoInformation* _tmp53_; + PhotoMetadata* _tmp54_; + MetadataDateTime* _tmp55_; + MetadataDateTime* _tmp56_; + DetectedPhotoInformation* _tmp58_; + PhotoMetadata* _tmp59_; + DetectedPhotoInformation* _tmp60_; + PhotoMetadata* _tmp61_; + gchar* _tmp62_; + DetectedPhotoInformation* _tmp63_; + PhotoMetadata* _tmp64_; + gchar* _tmp65_; + DetectedPhotoInformation* _tmp66_; + PhotoMetadata* _tmp67_; + GeeSet* _tmp68_; + DetectedPhotoInformation* _tmp69_; + PhotoMetadata* _tmp70_; #line 1234 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = detected; + _tmp53_ = detected; #line 1234 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = _tmp68_->metadata; + _tmp54_ = _tmp53_->metadata; #line 1234 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = photo_metadata_get_exposure_date_time (_tmp69_); + _tmp55_ = photo_metadata_get_exposure_date_time (_tmp54_); #line 1234 "/home/jens/Source/shotwell/src/Photo.vala" - date_time = _tmp70_; + date_time = _tmp55_; #line 1235 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = date_time; + _tmp56_ = date_time; #line 1235 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp71_ != NULL) { -#line 9844 "Photo.c" - MetadataDateTime* _tmp72_; - time_t _tmp73_; -#line 1236 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = date_time; + if (_tmp56_ != NULL) { +#line 10656 "Photo.c" + MetadataDateTime* _tmp57_; #line 1236 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = metadata_date_time_get_timestamp (_tmp72_); + _tmp57_ = date_time; #line 1236 "/home/jens/Source/shotwell/src/Photo.vala" - exposure_time = _tmp73_; -#line 9853 "Photo.c" + exposure_time = metadata_date_time_get_timestamp (_tmp57_); +#line 10662 "Photo.c" } #line 1238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = detected; -#line 1238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = _tmp74_->metadata; + _tmp58_ = detected; #line 1238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = photo_metadata_get_orientation (_tmp75_); + _tmp59_ = _tmp58_->metadata; #line 1238 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp76_; + orientation = photo_metadata_get_orientation (_tmp59_); #line 1239 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = detected; + _tmp60_ = detected; #line 1239 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = _tmp77_->metadata; + _tmp61_ = _tmp60_->metadata; #line 1239 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp62_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1239 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (title); #line 1239 "/home/jens/Source/shotwell/src/Photo.vala" - title = _tmp79_; + title = _tmp62_; #line 1240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = detected; + _tmp63_ = detected; #line 1240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = _tmp80_->metadata; + _tmp64_ = _tmp63_->metadata; #line 1240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp65_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1240 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (comment); #line 1240 "/home/jens/Source/shotwell/src/Photo.vala" - comment = _tmp82_; + comment = _tmp65_; #line 1241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = params; + _tmp66_ = detected; #line 1241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = detected; + _tmp67_ = _tmp66_->metadata; #line 1241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = _tmp84_->metadata; + _tmp68_ = photo_metadata_get_keywords (_tmp67_, NULL, NULL, NULL); #line 1241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = photo_metadata_get_keywords (_tmp85_, NULL, NULL, NULL); + _g_object_unref0 (params->keywords); #line 1241 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp83_->keywords); -#line 1241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_->keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1242 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = detected; + params->keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection); #line 1242 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = _tmp87_->metadata; + _tmp69_ = detected; #line 1242 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = photo_metadata_get_rating (_tmp88_); + _tmp70_ = _tmp69_->metadata; #line 1242 "/home/jens/Source/shotwell/src/Photo.vala" - rating = _tmp89_; + rating = photo_metadata_get_rating (_tmp70_); #line 1233 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 9905 "Photo.c" +#line 10708 "Photo.c" } #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = detected; + _tmp73_ = detected; #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = _tmp92_->colorspace; + _tmp74_ = _tmp73_->colorspace; #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp93_ != GDK_COLORSPACE_RGB) { + if (_tmp74_ != GDK_COLORSPACE_RGB) { #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = TRUE; -#line 9915 "Photo.c" + _tmp72_ = TRUE; +#line 10718 "Photo.c" } else { - DetectedPhotoInformation* _tmp94_; - gint _tmp95_; + DetectedPhotoInformation* _tmp75_; + gint _tmp76_; #line 1247 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = detected; + _tmp75_ = detected; #line 1247 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = _tmp94_->channels; + _tmp76_ = _tmp75_->channels; #line 1247 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = _tmp95_ < 3; -#line 9925 "Photo.c" + _tmp72_ = _tmp76_ < 3; +#line 10728 "Photo.c" } #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp91_) { + if (_tmp72_) { #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = TRUE; -#line 9931 "Photo.c" + _tmp71_ = TRUE; +#line 10734 "Photo.c" } else { - DetectedPhotoInformation* _tmp96_; - gint _tmp97_; + DetectedPhotoInformation* _tmp77_; + gint _tmp78_; #line 1248 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = detected; + _tmp77_ = detected; #line 1248 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = _tmp96_->bits_per_channel; + _tmp78_ = _tmp77_->bits_per_channel; #line 1248 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp97_ != 8; -#line 9941 "Photo.c" + _tmp71_ = _tmp78_ != 8; +#line 10744 "Photo.c" } #line 1246 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp90_) { -#line 9945 "Photo.c" - GFile* _tmp98_; - gchar* _tmp99_; - gchar* _tmp100_; + if (_tmp71_) { +#line 10748 "Photo.c" + GFile* _tmp79_; + gchar* _tmp80_; + gchar* _tmp81_; #line 1249 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = file; + _tmp79_ = file; #line 1249 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = g_file_get_path (_tmp98_); + _tmp80_ = g_file_get_path (_tmp79_); #line 1249 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = _tmp99_; + _tmp81_ = _tmp80_; #line 1249 "/home/jens/Source/shotwell/src/Photo.vala" - g_message ("Photo.vala:1249: Not importing %s: Unsupported color format", _tmp100_); + g_message ("Photo.vala:1249: Not importing %s: Unsupported color format", _tmp81_); #line 1249 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp100_); + _g_free0 (_tmp81_); #line 1251 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; #line 1251 "/home/jens/Source/shotwell/src/Photo.vala" @@ -9973,291 +10776,230 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1251 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 9975 "Photo.c" +#line 10778 "Photo.c" } #line 1257 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = params; + _tmp82_ = params->row; #line 1257 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = _tmp101_->row; -#line 1257 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id_init (&_tmp102_->photo_id, PHOTO_ID_INVALID); -#line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = params; + photo_id_init (&_tmp82_->photo_id, PHOTO_ID_INVALID); #line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = _tmp103_->row; + _tmp83_ = params->row; #line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = _tmp104_->master; + _tmp84_ = _tmp83_->master; #line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = file; + _tmp85_ = file; #line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = g_file_get_path (_tmp106_); + _tmp86_ = g_file_get_path (_tmp85_); #line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp105_->filepath); + _g_free0 (_tmp84_->filepath); #line 1258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_->filepath = _tmp107_; -#line 1259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp108_ = params; + _tmp84_->filepath = _tmp86_; #line 1259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_ = _tmp108_->row; + _tmp87_ = params->row; #line 1259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_ = _tmp109_->master; + _tmp88_ = _tmp87_->master; #line 1259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp111_ = detected; + _tmp89_ = detected; #line 1259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_ = _tmp111_->image_dim; + _tmp90_ = _tmp89_->image_dim; #line 1259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_->dim = _tmp112_; -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = params; + _tmp88_->dim = _tmp90_; #line 1260 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = _tmp113_->row; + _tmp91_ = params->row; #line 1260 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_ = _tmp114_->master; + _tmp92_ = _tmp91_->master; #line 1260 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_ = info; + _tmp93_ = info; #line 1260 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp117_ = g_file_info_get_size (_tmp116_); -#line 1260 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_->filesize = _tmp117_; -#line 1261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_ = params; + _tmp92_->filesize = g_file_info_get_size (_tmp93_); #line 1261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp119_ = _tmp118_->row; + _tmp94_ = params->row; #line 1261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_ = _tmp119_->master; + _tmp95_ = _tmp94_->master; #line 1261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp121_ = timestamp; + _tmp96_ = timestamp; #line 1261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp122_ = _tmp121_.tv_sec; + _tmp97_ = _tmp96_.tv_sec; #line 1261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_->timestamp = (time_t) _tmp122_; -#line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp123_ = params; + _tmp95_->timestamp = (time_t) _tmp97_; #line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_ = _tmp123_->row; + _tmp98_ = params->row; #line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp125_ = exposure_time; + _tmp99_ = exposure_time; #line 1262 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_->exposure_time = _tmp125_; + _tmp98_->exposure_time = _tmp99_; #line 1263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126_ = params; + _tmp100_ = params->row; #line 1263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp127_ = _tmp126_->row; + _tmp101_ = orientation; #line 1263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp128_ = orientation; -#line 1263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp127_->orientation = _tmp128_; -#line 1264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp129_ = params; + _tmp100_->orientation = _tmp101_; #line 1264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp130_ = _tmp129_->row; + _tmp102_ = params->row; #line 1264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp131_ = _tmp130_->master; + _tmp103_ = _tmp102_->master; #line 1264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp132_ = orientation; + _tmp104_ = orientation; #line 1264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp131_->original_orientation = _tmp132_; + _tmp103_->original_orientation = _tmp104_; #line 1265 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp133_ = params; + _tmp105_ = params->row; #line 1265 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp134_ = _tmp133_->row; + _tmp106_ = params->import_id; #line 1265 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp135_ = params; -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp136_ = _tmp135_->import_id; -#line 1265 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp134_->import_id = _tmp136_; -#line 1266 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp137_ = params; + _tmp105_->import_id = _tmp106_; #line 1266 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp138_ = _tmp137_->row; + _tmp107_ = params->row; #line 1266 "/home/jens/Source/shotwell/src/Photo.vala" - event_id_init (&_tmp138_->event_id, EVENT_ID_INVALID); + event_id_init (&_tmp107_->event_id, EVENT_ID_INVALID); #line 1267 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp139_ = params; + _tmp108_ = params->row; #line 1267 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp140_ = _tmp139_->row; + _g_object_unref0 (_tmp108_->transformations); #line 1267 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp140_->transformations); -#line 1267 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp140_->transformations = NULL; -#line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp141_ = params; + _tmp108_->transformations = NULL; #line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp142_ = _tmp141_->row; + _tmp109_ = params->row; #line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp143_ = detected; + _tmp110_ = detected; #line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp144_ = _tmp143_->md5; + _tmp111_ = _tmp110_->md5; #line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp145_ = g_strdup (_tmp144_); + _tmp112_ = g_strdup (_tmp111_); #line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp142_->md5); + _g_free0 (_tmp109_->md5); #line 1268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp142_->md5 = _tmp145_; + _tmp109_->md5 = _tmp112_; #line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp146_ = params; + _tmp113_ = params->row; #line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp147_ = _tmp146_->row; + _tmp114_ = detected; #line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp148_ = detected; + _tmp115_ = _tmp114_->thumbnail_md5; #line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp149_ = _tmp148_->thumbnail_md5; + _tmp116_ = g_strdup (_tmp115_); #line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp150_ = g_strdup (_tmp149_); + _g_free0 (_tmp113_->thumbnail_md5); #line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp147_->thumbnail_md5); -#line 1269 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp147_->thumbnail_md5 = _tmp150_; -#line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp151_ = params; + _tmp113_->thumbnail_md5 = _tmp116_; #line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp152_ = _tmp151_->row; + _tmp117_ = params->row; #line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp153_ = detected; + _tmp118_ = detected; #line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp154_ = _tmp153_->exif_md5; + _tmp119_ = _tmp118_->exif_md5; #line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp155_ = g_strdup (_tmp154_); + _tmp120_ = g_strdup (_tmp119_); #line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp152_->exif_md5); + _g_free0 (_tmp117_->exif_md5); #line 1270 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp152_->exif_md5 = _tmp155_; -#line 1271 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp156_ = params; + _tmp117_->exif_md5 = _tmp120_; #line 1271 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp157_ = _tmp156_->row; + _tmp121_ = params->row; #line 1271 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp157_->time_created = (time_t) 0; + _tmp121_->time_created = (time_t) 0; #line 1272 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp158_ = params; + _tmp122_ = params->row; #line 1272 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp159_ = _tmp158_->row; -#line 1272 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp159_->flags = (guint64) 0; -#line 1273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp160_ = params; + _tmp122_->flags = (guint64) 0; #line 1273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp161_ = _tmp160_->row; + _tmp123_ = params->row; #line 1273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp162_ = _tmp161_->master; + _tmp124_ = _tmp123_->master; #line 1273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp163_ = detected; + _tmp125_ = detected; #line 1273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp164_ = _tmp163_->file_format; + _tmp126_ = _tmp125_->file_format; #line 1273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp162_->file_format = _tmp164_; + _tmp124_->file_format = _tmp126_; #line 1274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp165_ = params; + _tmp127_ = params->row; #line 1274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp166_ = _tmp165_->row; + _tmp128_ = title; #line 1274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp167_ = title; + _tmp129_ = g_strdup (_tmp128_); #line 1274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp168_ = g_strdup (_tmp167_); + _g_free0 (_tmp127_->title); #line 1274 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp166_->title); -#line 1274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp166_->title = _tmp168_; -#line 1275 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp169_ = params; + _tmp127_->title = _tmp129_; #line 1275 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp170_ = _tmp169_->row; + _tmp130_ = params->row; #line 1275 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp171_ = comment; + _tmp131_ = comment; #line 1275 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp172_ = g_strdup (_tmp171_); + _tmp132_ = g_strdup (_tmp131_); #line 1275 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp170_->comment); + _g_free0 (_tmp130_->comment); #line 1275 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp170_->comment = _tmp172_; + _tmp130_->comment = _tmp132_; #line 1276 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp173_ = params; + _tmp133_ = params->row; #line 1276 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp174_ = _tmp173_->row; + _tmp134_ = rating; #line 1276 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp175_ = rating; -#line 1276 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp174_->rating = _tmp175_; -#line 1278 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp176_ = params; + _tmp133_->rating = _tmp134_; #line 1278 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp177_ = _tmp176_->thumbnails; + _tmp135_ = params->thumbnails; #line 1278 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp177_ != NULL) { -#line 10187 "Photo.c" + if (_tmp135_ != NULL) { +#line 10944 "Photo.c" PhotoFileReader* reader = NULL; - PhotoImportParams* _tmp178_; - PhotoRow* _tmp179_; - BackingPhotoRow* _tmp180_; - PhotoFileFormat _tmp181_; - PhotoImportParams* _tmp182_; - PhotoRow* _tmp183_; - BackingPhotoRow* _tmp184_; - const gchar* _tmp185_; - PhotoFileReader* _tmp186_; - PhotoFileReader* _tmp187_; + PhotoRow* _tmp136_; + BackingPhotoRow* _tmp137_; + PhotoFileFormat _tmp138_; + PhotoRow* _tmp139_; + BackingPhotoRow* _tmp140_; + const gchar* _tmp141_; + PhotoFileReader* _tmp142_; + PhotoFileReader* _tmp143_; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp178_ = params; + _tmp136_ = params->row; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp179_ = _tmp178_->row; + _tmp137_ = _tmp136_->master; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp180_ = _tmp179_->master; + _tmp138_ = _tmp137_->file_format; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp181_ = _tmp180_->file_format; + _tmp139_ = params->row; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp182_ = params; + _tmp140_ = _tmp139_->master; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp183_ = _tmp182_->row; + _tmp141_ = _tmp140_->filepath; #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp184_ = _tmp183_->master; + _tmp142_ = photo_file_format_create_reader (_tmp138_, _tmp141_); #line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp185_ = _tmp184_->filepath; -#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp186_ = photo_file_format_create_reader (_tmp181_, _tmp185_); -#line 1279 "/home/jens/Source/shotwell/src/Photo.vala" - reader = _tmp186_; + reader = _tmp142_; #line 1281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp187_ = reader; + _tmp143_ = reader; #line 1281 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_reader_set_role (_tmp187_, PHOTO_FILE_READER_ROLE_THUMBNAIL); -#line 10223 "Photo.c" - { - PhotoImportParams* _tmp188_; - Thumbnails* _tmp189_; - PhotoFileReader* _tmp190_; - PhotoImportParams* _tmp191_; - PhotoRow* _tmp192_; - Orientation _tmp193_; - PhotoImportParams* _tmp194_; - PhotoRow* _tmp195_; - BackingPhotoRow* _tmp196_; - Dimensions _tmp197_; -#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp188_ = params; -#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp189_ = _tmp188_->thumbnails; -#line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp190_ = reader; + photo_file_reader_set_role (_tmp143_, PHOTO_FILE_READER_ROLE_THUMBNAIL); +#line 10974 "Photo.c" + { + Thumbnails* _tmp144_; + PhotoFileReader* _tmp145_; + PhotoRow* _tmp146_; + Orientation _tmp147_; + PhotoRow* _tmp148_; + BackingPhotoRow* _tmp149_; + Dimensions _tmp150_; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp191_ = params; + _tmp144_ = params->thumbnails; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp192_ = _tmp191_->row; + _tmp145_ = reader; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp193_ = _tmp192_->orientation; + _tmp146_ = params->row; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp194_ = params; + _tmp147_ = _tmp146_->orientation; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp195_ = _tmp194_->row; + _tmp148_ = params->row; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp196_ = _tmp195_->master; + _tmp149_ = _tmp148_->master; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp197_ = _tmp196_->dim; + _tmp150_ = _tmp149_->dim; #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" - thumbnail_cache_generate_for_photo (_tmp189_, _tmp190_, _tmp193_, &_tmp197_, &_inner_error_); + thumbnail_cache_generate_for_photo (_tmp144_, _tmp145_, _tmp147_, &_tmp150_, &_inner_error_); #line 1283 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10259 "Photo.c" +#line 11001 "Photo.c" goto __catch314_g_error; } } @@ -10265,18 +11007,15 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { __catch314_g_error: { GError* err = NULL; - GError* _tmp198_; - ImportResult _tmp199_; + GError* _tmp151_; #line 1282 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1282 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1286 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp198_ = err; + _tmp151_ = err; #line 1286 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp199_ = import_result_convert_error (_tmp198_, IMPORT_RESULT_FILE_ERROR); -#line 1286 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp199_; + result = import_result_convert_error (_tmp151_, IMPORT_RESULT_FILE_ERROR); #line 1286 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); #line 1286 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10295,7 +11034,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1286 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10297 "Photo.c" +#line 11036 "Photo.c" } __finally314: #line 1282 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10320,11 +11059,11 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { g_clear_error (&_inner_error_); #line 1282 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 10322 "Photo.c" +#line 11061 "Photo.c" } #line 1278 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 10326 "Photo.c" +#line 11065 "Photo.c" } #line 1293 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_SUCCESS; @@ -10342,349 +11081,272 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) { _g_object_unref0 (file); #line 1293 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10344 "Photo.c" +#line 11083 "Photo.c" } -void photo_create_pre_import (PhotoImportParams* params) { +void +photo_create_pre_import (PhotoImportParams* params) +{ GFile* file = NULL; - PhotoImportParams* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; - PhotoImportParams* _tmp3_; - PhotoRow* _tmp4_; - PhotoImportParams* _tmp5_; + PhotoRow* _tmp2_; + PhotoRow* _tmp3_; + BackingPhotoRow* _tmp4_; + gchar* _tmp5_; PhotoRow* _tmp6_; BackingPhotoRow* _tmp7_; - gchar* _tmp8_; - PhotoImportParams* _tmp9_; + PhotoRow* _tmp8_; + BackingPhotoRow* _tmp9_; PhotoRow* _tmp10_; BackingPhotoRow* _tmp11_; - PhotoImportParams* _tmp12_; + PhotoRow* _tmp12_; PhotoRow* _tmp13_; - BackingPhotoRow* _tmp14_; - PhotoImportParams* _tmp15_; + PhotoRow* _tmp14_; + BackingPhotoRow* _tmp15_; PhotoRow* _tmp16_; - BackingPhotoRow* _tmp17_; - PhotoImportParams* _tmp18_; + ImportID _tmp17_; + PhotoRow* _tmp18_; PhotoRow* _tmp19_; - PhotoImportParams* _tmp20_; + PhotoRow* _tmp20_; PhotoRow* _tmp21_; - PhotoImportParams* _tmp22_; + PhotoRow* _tmp22_; PhotoRow* _tmp23_; - BackingPhotoRow* _tmp24_; - PhotoImportParams* _tmp25_; - PhotoRow* _tmp26_; - PhotoImportParams* _tmp27_; - ImportID _tmp28_; - PhotoImportParams* _tmp29_; - PhotoRow* _tmp30_; - PhotoImportParams* _tmp31_; - PhotoRow* _tmp32_; - PhotoImportParams* _tmp33_; - PhotoRow* _tmp34_; - PhotoImportParams* _tmp35_; - PhotoRow* _tmp36_; - PhotoImportParams* _tmp37_; - PhotoRow* _tmp38_; - PhotoImportParams* _tmp39_; - PhotoRow* _tmp40_; - PhotoImportParams* _tmp41_; - PhotoRow* _tmp42_; - PhotoImportParams* _tmp43_; - PhotoRow* _tmp44_; - BackingPhotoRow* _tmp45_; - PhotoImportParams* _tmp46_; - PhotoRow* _tmp47_; - PhotoImportParams* _tmp48_; - PhotoRow* _tmp49_; - PhotoImportParams* _tmp50_; - PhotoRow* _tmp51_; + PhotoRow* _tmp24_; + PhotoRow* _tmp25_; + BackingPhotoRow* _tmp26_; + PhotoRow* _tmp27_; + PhotoRow* _tmp28_; + PhotoRow* _tmp29_; PhotoFileInterrogator* interrogator = NULL; - PhotoImportParams* _tmp52_; - GFile* _tmp53_; - PhotoImportParams* _tmp54_; - PhotoFileSnifferOptions _tmp55_; - PhotoFileInterrogator* _tmp56_; + GFile* _tmp30_; + PhotoFileSnifferOptions _tmp31_; + PhotoFileInterrogator* _tmp32_; GError * _inner_error_ = NULL; #line 1296 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO_IMPORT_PARAMS (params)); #line 1297 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = params; -#line 1297 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp0_->file; + _tmp0_ = params->file; #line 1297 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 1297 "/home/jens/Source/shotwell/src/Photo.vala" - file = _tmp2_; -#line 1298 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = params; + file = _tmp1_; #line 1298 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_->row; + _tmp2_ = params->row; #line 1298 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id_init (&_tmp4_->photo_id, PHOTO_ID_INVALID); -#line 1299 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = params; + photo_id_init (&_tmp2_->photo_id, PHOTO_ID_INVALID); #line 1299 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_->row; + _tmp3_ = params->row; #line 1299 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_->master; + _tmp4_ = _tmp3_->master; #line 1299 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_file_get_path (file); + _tmp5_ = g_file_get_path (file); #line 1299 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp7_->filepath); + _g_free0 (_tmp4_->filepath); #line 1299 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_->filepath = _tmp8_; -#line 1300 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = params; + _tmp4_->filepath = _tmp5_; #line 1300 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_->row; + _tmp6_ = params->row; #line 1300 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_->master; + _tmp7_ = _tmp6_->master; #line 1300 "/home/jens/Source/shotwell/src/Photo.vala" - dimensions_init (&_tmp11_->dim, 0, 0); -#line 1301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = params; + dimensions_init (&_tmp7_->dim, 0, 0); #line 1301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_->row; + _tmp8_ = params->row; #line 1301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->master; + _tmp9_ = _tmp8_->master; #line 1301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_->filesize = (gint64) 0; + _tmp9_->filesize = (gint64) 0; #line 1302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = params; + _tmp10_ = params->row; #line 1302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_->row; -#line 1302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_->master; + _tmp11_ = _tmp10_->master; #line 1302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_->timestamp = (time_t) 0; -#line 1303 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = params; + _tmp11_->timestamp = (time_t) 0; #line 1303 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->row; + _tmp12_ = params->row; #line 1303 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_->exposure_time = (time_t) 0; + _tmp12_->exposure_time = (time_t) 0; #line 1304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = params; + _tmp13_ = params->row; #line 1304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_->row; -#line 1304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_->orientation = ORIENTATION_TOP_LEFT; -#line 1305 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = params; + _tmp13_->orientation = ORIENTATION_TOP_LEFT; #line 1305 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_->row; + _tmp14_ = params->row; #line 1305 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_->master; + _tmp15_ = _tmp14_->master; #line 1305 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_->original_orientation = ORIENTATION_TOP_LEFT; -#line 1306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = params; -#line 1306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_->row; + _tmp15_->original_orientation = ORIENTATION_TOP_LEFT; #line 1306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = params; + _tmp16_ = params->row; #line 1306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_->import_id; + _tmp17_ = params->import_id; #line 1306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_->import_id = _tmp28_; + _tmp16_->import_id = _tmp17_; #line 1307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = params; + _tmp18_ = params->row; #line 1307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_->row; -#line 1307 "/home/jens/Source/shotwell/src/Photo.vala" - event_id_init (&_tmp30_->event_id, EVENT_ID_INVALID); -#line 1308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = params; + event_id_init (&_tmp18_->event_id, EVENT_ID_INVALID); #line 1308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_->row; + _tmp19_ = params->row; #line 1308 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp32_->transformations); + _g_object_unref0 (_tmp19_->transformations); #line 1308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_->transformations = NULL; + _tmp19_->transformations = NULL; #line 1309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = params; + _tmp20_ = params->row; #line 1309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_->row; + _g_free0 (_tmp20_->md5); #line 1309 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp34_->md5); -#line 1309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_->md5 = NULL; -#line 1310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = params; + _tmp20_->md5 = NULL; #line 1310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _tmp35_->row; + _tmp21_ = params->row; #line 1310 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp36_->thumbnail_md5); + _g_free0 (_tmp21_->thumbnail_md5); #line 1310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_->thumbnail_md5 = NULL; -#line 1311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = params; + _tmp21_->thumbnail_md5 = NULL; #line 1311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp37_->row; + _tmp22_ = params->row; #line 1311 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp38_->exif_md5); + _g_free0 (_tmp22_->exif_md5); #line 1311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_->exif_md5 = NULL; + _tmp22_->exif_md5 = NULL; #line 1312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = params; + _tmp23_ = params->row; #line 1312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _tmp39_->row; -#line 1312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_->time_created = (time_t) 0; -#line 1313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = params; + _tmp23_->time_created = (time_t) 0; #line 1313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_->row; + _tmp24_ = params->row; #line 1313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_->flags = (guint64) 0; + _tmp24_->flags = (guint64) 0; #line 1314 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = params; + _tmp25_ = params->row; #line 1314 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp43_->row; + _tmp26_ = _tmp25_->master; #line 1314 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _tmp44_->master; -#line 1314 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_->file_format = PHOTO_FILE_FORMAT_JFIF; -#line 1315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = params; + _tmp26_->file_format = PHOTO_FILE_FORMAT_JFIF; #line 1315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _tmp46_->row; + _tmp27_ = params->row; #line 1315 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp47_->title); + _g_free0 (_tmp27_->title); #line 1315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_->title = NULL; -#line 1316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = params; + _tmp27_->title = NULL; #line 1316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_->row; + _tmp28_ = params->row; #line 1316 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp49_->comment); + _g_free0 (_tmp28_->comment); #line 1316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_->comment = NULL; + _tmp28_->comment = NULL; #line 1317 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = params; + _tmp29_ = params->row; #line 1317 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _tmp50_->row; -#line 1317 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_->rating = RATING_UNRATED; -#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = params; + _tmp29_->rating = RATING_UNRATED; #line 1319 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp52_->file; + _tmp30_ = params->file; #line 1319 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = params; + _tmp31_ = params->sniffer_options; #line 1319 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = _tmp54_->sniffer_options; + _tmp32_ = photo_file_interrogator_new (_tmp30_, _tmp31_); #line 1319 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = photo_file_interrogator_new (_tmp53_, _tmp55_); -#line 1319 "/home/jens/Source/shotwell/src/Photo.vala" - interrogator = _tmp56_; -#line 10583 "Photo.c" + interrogator = _tmp32_; +#line 11252 "Photo.c" { DetectedPhotoInformation* detected = NULL; - DetectedPhotoInformation* _tmp57_; - gboolean _tmp58_ = FALSE; - gboolean _tmp59_ = FALSE; - DetectedPhotoInformation* _tmp60_; + DetectedPhotoInformation* _tmp33_; + gboolean _tmp34_ = FALSE; + gboolean _tmp35_ = FALSE; + DetectedPhotoInformation* _tmp36_; #line 1321 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (interrogator, &_inner_error_); #line 1321 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10594 "Photo.c" +#line 11263 "Photo.c" goto __catch315_g_error; } #line 1322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = photo_file_interrogator_get_detected_photo_information (interrogator); + _tmp33_ = photo_file_interrogator_get_detected_photo_information (interrogator); #line 1322 "/home/jens/Source/shotwell/src/Photo.vala" - detected = _tmp57_; + detected = _tmp33_; #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = detected; + _tmp36_ = detected; #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp60_ != NULL) { -#line 10605 "Photo.c" - gboolean _tmp61_; + if (_tmp36_ != NULL) { #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = photo_file_interrogator_get_is_photo_corrupted (interrogator); -#line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = !_tmp61_; -#line 10611 "Photo.c" + _tmp35_ = !photo_file_interrogator_get_is_photo_corrupted (interrogator); +#line 11276 "Photo.c" } else { #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = FALSE; -#line 10615 "Photo.c" + _tmp35_ = FALSE; +#line 11280 "Photo.c" } #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp59_) { -#line 10619 "Photo.c" - DetectedPhotoInformation* _tmp62_; - PhotoFileFormat _tmp63_; + if (_tmp35_) { +#line 11284 "Photo.c" + DetectedPhotoInformation* _tmp37_; + PhotoFileFormat _tmp38_; #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = detected; + _tmp37_ = detected; #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = _tmp62_->file_format; + _tmp38_ = _tmp37_->file_format; #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _tmp63_ != PHOTO_FILE_FORMAT_UNKNOWN; -#line 10628 "Photo.c" + _tmp34_ = _tmp38_ != PHOTO_FILE_FORMAT_UNKNOWN; +#line 11293 "Photo.c" } else { #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = FALSE; -#line 10632 "Photo.c" + _tmp34_ = FALSE; +#line 11297 "Photo.c" } #line 1323 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp58_) { -#line 10636 "Photo.c" - PhotoImportParams* _tmp64_; - PhotoRow* _tmp65_; - BackingPhotoRow* _tmp66_; - DetectedPhotoInformation* _tmp67_; - PhotoFileFormat _tmp68_; -#line 1324 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = params; + if (_tmp34_) { +#line 11301 "Photo.c" + PhotoRow* _tmp39_; + BackingPhotoRow* _tmp40_; + DetectedPhotoInformation* _tmp41_; + PhotoFileFormat _tmp42_; #line 1324 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = _tmp64_->row; + _tmp39_ = params->row; #line 1324 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = _tmp65_->master; + _tmp40_ = _tmp39_->master; #line 1324 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = detected; + _tmp41_ = detected; #line 1324 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = _tmp67_->file_format; + _tmp42_ = _tmp41_->file_format; #line 1324 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_->file_format = _tmp68_; -#line 10654 "Photo.c" + _tmp40_->file_format = _tmp42_; +#line 11316 "Photo.c" } #line 1320 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); -#line 10658 "Photo.c" +#line 11320 "Photo.c" } goto __finally315; __catch315_g_error: { GError* err = NULL; - gchar* _tmp69_; - gchar* _tmp70_; - GError* _tmp71_; - const gchar* _tmp72_; + gchar* _tmp43_; + gchar* _tmp44_; + GError* _tmp45_; + const gchar* _tmp46_; #line 1320 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1320 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = g_file_get_path (file); + _tmp43_ = g_file_get_path (file); #line 1326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = _tmp69_; + _tmp44_ = _tmp43_; #line 1326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = err; + _tmp45_ = err; #line 1326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_->message; + _tmp46_ = _tmp45_->message; #line 1326 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:1326: Unable to interrogate photo file %s: %s", _tmp70_, _tmp72_); + g_debug ("Photo.vala:1326: Unable to interrogate photo file %s: %s", _tmp44_, _tmp46_); #line 1326 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp70_); + _g_free0 (_tmp44_); #line 1320 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 10686 "Photo.c" +#line 11348 "Photo.c" } __finally315: #line 1320 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10699,53 +11361,55 @@ void photo_create_pre_import (PhotoImportParams* params) { g_clear_error (&_inner_error_); #line 1320 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 10701 "Photo.c" +#line 11363 "Photo.c" } #line 1296 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_interrogator_unref0 (interrogator); #line 1296 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 10707 "Photo.c" +#line 11369 "Photo.c" } -BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoFileSnifferOptions options, DetectedPhotoInformation* * detected, GError** error) { +BackingPhotoRow* +photo_query_backing_photo_row (Photo* self, + GFile* file, + PhotoFileSnifferOptions options, + DetectedPhotoInformation* * detected, + GError** error) +{ DetectedPhotoInformation* _vala_detected = NULL; BackingPhotoRow* result = NULL; BackingPhotoRow* backing = NULL; BackingPhotoRow* _tmp0_; GFileInfo* info = NULL; PhotoFileInterrogator* interrogator = NULL; - GFile* _tmp10_; - PhotoFileSnifferOptions _tmp11_; - PhotoFileInterrogator* _tmp12_; - PhotoFileInterrogator* _tmp13_; - PhotoFileInterrogator* _tmp14_; - DetectedPhotoInformation* _tmp15_; - gboolean _tmp16_ = FALSE; - DetectedPhotoInformation* _tmp17_; + PhotoFileInterrogator* _tmp8_; + PhotoFileInterrogator* _tmp9_; + PhotoFileInterrogator* _tmp10_; + DetectedPhotoInformation* _tmp11_; + gboolean _tmp12_ = FALSE; + DetectedPhotoInformation* _tmp13_; GTimeVal modification_time = {0}; - GFileInfo* _tmp22_; - GTimeVal _tmp23_ = {0}; + GFileInfo* _tmp17_; + GTimeVal _tmp18_ = {0}; + BackingPhotoRow* _tmp19_; + gchar* _tmp20_; + BackingPhotoRow* _tmp21_; + GTimeVal _tmp22_; + glong _tmp23_; BackingPhotoRow* _tmp24_; - GFile* _tmp25_; - gchar* _tmp26_; - BackingPhotoRow* _tmp27_; - GTimeVal _tmp28_; - glong _tmp29_; - BackingPhotoRow* _tmp30_; - GFileInfo* _tmp31_; - gint64 _tmp32_; - BackingPhotoRow* _tmp33_; - DetectedPhotoInformation* _tmp34_; - PhotoFileFormat _tmp35_; - BackingPhotoRow* _tmp36_; - DetectedPhotoInformation* _tmp37_; - Dimensions _tmp38_; - Orientation _tmp39_ = 0; - DetectedPhotoInformation* _tmp40_; - PhotoMetadata* _tmp41_; - BackingPhotoRow* _tmp45_; + GFileInfo* _tmp25_; + BackingPhotoRow* _tmp26_; + DetectedPhotoInformation* _tmp27_; + PhotoFileFormat _tmp28_; + BackingPhotoRow* _tmp29_; + DetectedPhotoInformation* _tmp30_; + Dimensions _tmp31_; + Orientation _tmp32_ = 0; + DetectedPhotoInformation* _tmp33_; + PhotoMetadata* _tmp34_; + BackingPhotoRow* _tmp37_; GError * _inner_error_ = NULL; #line 1330 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); @@ -10761,62 +11425,56 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF backing = _tmp0_; #line 1336 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 10763 "Photo.c" +#line 11427 "Photo.c" { GFileInfo* _tmp1_ = NULL; - GFile* _tmp2_; + GFileInfo* _tmp2_; GFileInfo* _tmp3_; - GFileInfo* _tmp4_; #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = file; -#line 1338 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = g_file_query_info (_tmp2_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); + _tmp2_ = g_file_query_info (file, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp3_; + _tmp1_ = _tmp2_; #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10777 "Photo.c" +#line 11438 "Photo.c" goto __catch316_g_error; } #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp1_; + _tmp3_ = _tmp1_; #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); #line 1338 "/home/jens/Source/shotwell/src/Photo.vala" - info = _tmp4_; + info = _tmp3_; #line 1337 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 10790 "Photo.c" +#line 11451 "Photo.c" } goto __finally316; __catch316_g_error: { GError* err = NULL; - GFile* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - GError* _tmp8_; - const gchar* _tmp9_; + gchar* _tmp4_; + gchar* _tmp5_; + GError* _tmp6_; + const gchar* _tmp7_; #line 1337 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1337 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = file; + _tmp4_ = g_file_get_path (file); #line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = g_file_get_path (_tmp5_); -#line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = err; + _tmp6_ = err; #line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_->message; + _tmp7_ = _tmp6_->message; #line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - g_critical ("Photo.vala:1341: Unable to read file information for %s: %s", _tmp7_, _tmp9_); + g_critical ("Photo.vala:1341: Unable to read file information for %s: %s", _tmp5_, _tmp7_); #line 1341 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp5_); #line 1343 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; #line 1343 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10829,15 +11487,15 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF if (detected) { #line 1343 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 10831 "Photo.c" +#line 11489 "Photo.c" } else { #line 1343 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 10835 "Photo.c" +#line 11493 "Photo.c" } #line 1343 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10839 "Photo.c" +#line 11497 "Photo.c" } __finally316: #line 1337 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10850,20 +11508,16 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF _backing_photo_row_unref0 (backing); #line 1337 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 10852 "Photo.c" +#line 11510 "Photo.c" } #line 1347 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = file; -#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = options; -#line 1347 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_file_interrogator_new (_tmp10_, _tmp11_); + _tmp8_ = photo_file_interrogator_new (file, options); #line 1347 "/home/jens/Source/shotwell/src/Photo.vala" - interrogator = _tmp12_; + interrogator = _tmp8_; #line 1348 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = interrogator; + _tmp9_ = interrogator; #line 1348 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_interrogator_interrogate (_tmp13_, &_inner_error_); + photo_file_interrogator_interrogate (_tmp9_, &_inner_error_); #line 1348 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1348 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10876,47 +11530,44 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF _backing_photo_row_unref0 (backing); #line 1348 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 10878 "Photo.c" +#line 11532 "Photo.c" } #line 1349 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = interrogator; + _tmp10_ = interrogator; #line 1349 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_interrogator_get_detected_photo_information (_tmp14_); + _tmp11_ = photo_file_interrogator_get_detected_photo_information (_tmp10_); #line 1349 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); #line 1349 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_detected = _tmp15_; + _vala_detected = _tmp11_; #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _vala_detected; + _tmp13_ = _vala_detected; #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_ == NULL) { + if (_tmp13_ == NULL) { #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = TRUE; -#line 10894 "Photo.c" + _tmp12_ = TRUE; +#line 11548 "Photo.c" } else { - PhotoFileInterrogator* _tmp18_; - gboolean _tmp19_; -#line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = interrogator; + PhotoFileInterrogator* _tmp14_; #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = photo_file_interrogator_get_is_photo_corrupted (_tmp18_); + _tmp14_ = interrogator; #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp19_; -#line 10904 "Photo.c" + _tmp12_ = photo_file_interrogator_get_is_photo_corrupted (_tmp14_); +#line 11555 "Photo.c" } #line 1350 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp16_) { -#line 10908 "Photo.c" - gchar* _tmp20_; - gchar* _tmp21_; + if (_tmp12_) { +#line 11559 "Photo.c" + gchar* _tmp15_; + gchar* _tmp16_; #line 1351 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp15_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 1351 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_; + _tmp16_ = _tmp15_; #line 1351 "/home/jens/Source/shotwell/src/Photo.vala" - g_critical ("Photo.vala:1351: Photo update: %s no longer a recognized image", _tmp21_); + g_critical ("Photo.vala:1351: Photo update: %s no longer a recognized image", _tmp16_); #line 1351 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp16_); #line 1353 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; #line 1353 "/home/jens/Source/shotwell/src/Photo.vala" @@ -10929,92 +11580,85 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF if (detected) { #line 1353 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 10931 "Photo.c" +#line 11582 "Photo.c" } else { #line 1353 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 10935 "Photo.c" +#line 11586 "Photo.c" } #line 1353 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 10939 "Photo.c" +#line 11590 "Photo.c" } #line 1356 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = info; + _tmp17_ = info; #line 1356 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_info_get_modification_time (_tmp22_, &_tmp23_); + g_file_info_get_modification_time (_tmp17_, &_tmp18_); #line 1356 "/home/jens/Source/shotwell/src/Photo.vala" - modification_time = _tmp23_; -#line 1358 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = backing; + modification_time = _tmp18_; #line 1358 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = file; + _tmp19_ = backing; #line 1358 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = g_file_get_path (_tmp25_); + _tmp20_ = g_file_get_path (file); #line 1358 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp24_->filepath); + _g_free0 (_tmp19_->filepath); #line 1358 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_->filepath = _tmp26_; + _tmp19_->filepath = _tmp20_; #line 1359 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = backing; + _tmp21_ = backing; #line 1359 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = modification_time; + _tmp22_ = modification_time; #line 1359 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_.tv_sec; + _tmp23_ = _tmp22_.tv_sec; #line 1359 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_->timestamp = (time_t) _tmp29_; + _tmp21_->timestamp = (time_t) _tmp23_; #line 1360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = backing; -#line 1360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = info; + _tmp24_ = backing; #line 1360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = g_file_info_get_size (_tmp31_); + _tmp25_ = info; #line 1360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_->filesize = _tmp32_; + _tmp24_->filesize = g_file_info_get_size (_tmp25_); #line 1361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = backing; + _tmp26_ = backing; #line 1361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _vala_detected; + _tmp27_ = _vala_detected; #line 1361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_->file_format; + _tmp28_ = _tmp27_->file_format; #line 1361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_->file_format = _tmp35_; + _tmp26_->file_format = _tmp28_; #line 1362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = backing; + _tmp29_ = backing; #line 1362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _vala_detected; + _tmp30_ = _vala_detected; #line 1362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp37_->image_dim; + _tmp31_ = _tmp30_->image_dim; #line 1362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_->dim = _tmp38_; + _tmp29_->dim = _tmp31_; #line 1363 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _vala_detected; + _tmp33_ = _vala_detected; #line 1363 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_->metadata; + _tmp34_ = _tmp33_->metadata; #line 1363 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp41_ != NULL) { -#line 10995 "Photo.c" - DetectedPhotoInformation* _tmp42_; - PhotoMetadata* _tmp43_; - Orientation _tmp44_; -#line 1364 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _vala_detected; + if (_tmp34_ != NULL) { +#line 11642 "Photo.c" + DetectedPhotoInformation* _tmp35_; + PhotoMetadata* _tmp36_; #line 1364 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp42_->metadata; + _tmp35_ = _vala_detected; #line 1364 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = photo_metadata_get_orientation (_tmp43_); + _tmp36_ = _tmp35_->metadata; #line 1364 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tmp44_; -#line 11007 "Photo.c" + _tmp32_ = photo_metadata_get_orientation (_tmp36_); +#line 11651 "Photo.c" } else { #line 1364 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = ORIENTATION_TOP_LEFT; -#line 11011 "Photo.c" + _tmp32_ = ORIENTATION_TOP_LEFT; +#line 11655 "Photo.c" } #line 1363 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = backing; + _tmp37_ = backing; #line 1363 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_->original_orientation = _tmp39_; + _tmp37_->original_orientation = _tmp32_; #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" result = backing; #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11025,128 +11669,164 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF if (detected) { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 11027 "Photo.c" +#line 11671 "Photo.c" } else { #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 11031 "Photo.c" +#line 11675 "Photo.c" } #line 1366 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11035 "Photo.c" +#line 11679 "Photo.c" } -static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add92 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11046 "Photo.c" +#line 11695 "Photo.c" } #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11052 "Photo.c" +#line 11701 "Photo.c" } -static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add93 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11063 "Photo.c" +#line 11717 "Photo.c" } #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1465 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11069 "Photo.c" +#line 11723 "Photo.c" } -static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add94 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11080 "Photo.c" +#line 11739 "Photo.c" } #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11086 "Photo.c" +#line 11745 "Photo.c" } -static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add95 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11097 "Photo.c" +#line 11761 "Photo.c" } #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11103 "Photo.c" +#line 11767 "Photo.c" } -static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add96 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11114 "Photo.c" +#line 11783 "Photo.c" } #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11120 "Photo.c" +#line 11789 "Photo.c" } -static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add97 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11131 "Photo.c" +#line 11805 "Photo.c" } #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11137 "Photo.c" +#line 11811 "Photo.c" } -static gpointer _media_metadata_ref0 (gpointer self) { +static gpointer +_media_metadata_ref0 (gpointer self) +{ #line 1491 "/home/jens/Source/shotwell/src/Photo.vala" return self ? media_metadata_ref (self) : NULL; -#line 11144 "Photo.c" +#line 11820 "Photo.c" } -gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error) { +gboolean +photo_prepare_for_reimport_master (Photo* self, + PhotoReimportMasterState* * reimport_state, + GError** error) +{ PhotoReimportMasterState* _vala_reimport_state = NULL; gboolean result = FALSE; GFile* file = NULL; @@ -11181,29 +11861,29 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat Orientation _tmp40_; DetectedPhotoInformation* _tmp47_; PhotoMetadata* _tmp48_; - PhotoRow* _tmp85_; - BackingPhotoRow* _tmp86_; - BackingPhotoRow* _tmp87_; - PhotoRow* _tmp88_; - DetectedPhotoInformation* _tmp89_; - const gchar* _tmp90_; - gchar* _tmp91_; - PhotoRow* _tmp92_; - DetectedPhotoInformation* _tmp93_; - const gchar* _tmp94_; - gchar* _tmp95_; - PhotoRow* _tmp96_; - DetectedPhotoInformation* _tmp97_; - const gchar* _tmp98_; - gchar* _tmp99_; + PhotoRow* _tmp83_; + BackingPhotoRow* _tmp84_; + BackingPhotoRow* _tmp85_; + PhotoRow* _tmp86_; + DetectedPhotoInformation* _tmp87_; + const gchar* _tmp88_; + gchar* _tmp89_; + PhotoRow* _tmp90_; + DetectedPhotoInformation* _tmp91_; + const gchar* _tmp92_; + gchar* _tmp93_; + PhotoRow* _tmp94_; + DetectedPhotoInformation* _tmp95_; + const gchar* _tmp96_; + gchar* _tmp97_; PhotoMetadata* metadata = NULL; - DetectedPhotoInformation* _tmp100_; - PhotoMetadata* _tmp101_; - PhotoRow* _tmp124_; - PhotoMetadata* _tmp125_; - gchar** _tmp126_; - gint _tmp126__length1; - PhotoReimportMasterStateImpl* _tmp127_; + DetectedPhotoInformation* _tmp98_; + PhotoMetadata* _tmp99_; + PhotoRow* _tmp120_; + PhotoMetadata* _tmp121_; + gchar** _tmp122_; + gint _tmp122__length1; + PhotoReimportMasterStateImpl* _tmp123_; GError * _inner_error_ = NULL; #line 1430 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -11235,7 +11915,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat backing = _tmp6_; #line 1436 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11237 "Photo.c" +#line 11917 "Photo.c" gboolean _tmp7_ = FALSE; #line 1436 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); @@ -11245,13 +11925,13 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _g_object_unref0 (file); #line 1436 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp7_; -#line 11247 "Photo.c" +#line 11927 "Photo.c" } #line 1438 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = backing; #line 1438 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ == NULL) { -#line 11253 "Photo.c" +#line 11933 "Photo.c" GFile* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; @@ -11277,15 +11957,15 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat if (reimport_state) { #line 1440 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11279 "Photo.c" +#line 11959 "Photo.c" } else { #line 1440 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11283 "Photo.c" +#line 11963 "Photo.c" } #line 1440 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11287 "Photo.c" +#line 11967 "Photo.c" } #line 1444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = detected; @@ -11295,7 +11975,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat if (_tmp15_ != GDK_COLORSPACE_RGB) { #line 1444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = TRUE; -#line 11297 "Photo.c" +#line 11977 "Photo.c" } else { DetectedPhotoInformation* _tmp16_; gint _tmp17_; @@ -11305,13 +11985,13 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp17_ = _tmp16_->channels; #line 1445 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = _tmp17_ < 3; -#line 11307 "Photo.c" +#line 11987 "Photo.c" } #line 1444 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_) { #line 1444 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = TRUE; -#line 11313 "Photo.c" +#line 11993 "Photo.c" } else { DetectedPhotoInformation* _tmp18_; gint _tmp19_; @@ -11321,11 +12001,11 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp19_ = _tmp18_->bits_per_channel; #line 1446 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp19_ != 8; -#line 11323 "Photo.c" +#line 12003 "Photo.c" } #line 1444 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp12_) { -#line 11327 "Photo.c" +#line 12007 "Photo.c" GFile* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; @@ -11351,28 +12031,28 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat if (reimport_state) { #line 1449 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11353 "Photo.c" +#line 12033 "Photo.c" } else { #line 1449 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11357 "Photo.c" +#line 12037 "Photo.c" } #line 1449 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11361 "Photo.c" +#line 12041 "Photo.c" } #line 1453 "/home/jens/Source/shotwell/src/Photo.vala" _tmp23_ = photo_row_new (); #line 1453 "/home/jens/Source/shotwell/src/Photo.vala" updated_row = _tmp23_; -#line 11367 "Photo.c" +#line 12047 "Photo.c" { PhotoRow* _tmp24_; #line 1454 "/home/jens/Source/shotwell/src/Photo.vala" _tmp24_ = self->row; #line 1454 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 11374 "Photo.c" +#line 12054 "Photo.c" { PhotoRow* _tmp25_; PhotoRow* _tmp26_; @@ -11384,7 +12064,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _photo_row_unref0 (updated_row); #line 1455 "/home/jens/Source/shotwell/src/Photo.vala" updated_row = _tmp26_; -#line 11386 "Photo.c" +#line 12066 "Photo.c" } __finally317: { @@ -11393,11 +12073,11 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp27_ = self->row; #line 1454 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 11395 "Photo.c" +#line 12075 "Photo.c" } #line 1454 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11399 "Photo.c" +#line 12079 "Photo.c" gboolean _tmp28_ = FALSE; #line 1454 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); @@ -11411,7 +12091,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _g_object_unref0 (file); #line 1454 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp28_; -#line 11413 "Photo.c" +#line 12093 "Photo.c" } } #line 1459 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11432,7 +12112,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp33_ = _tmp32_->md5; #line 1461 "/home/jens/Source/shotwell/src/Photo.vala" if (g_strcmp0 (_tmp31_, _tmp33_) != 0) { -#line 11434 "Photo.c" +#line 12114 "Photo.c" gchar** _tmp34_; gint _tmp34__length1; gchar* _tmp35_; @@ -11444,7 +12124,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp35_ = g_strdup ("metadata:md5"); #line 1462 "/home/jens/Source/shotwell/src/Photo.vala" _vala_array_add92 (&list, &list_length1, &_list_size_, _tmp35_); -#line 11446 "Photo.c" +#line 12126 "Photo.c" } #line 1464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp36_ = updated_row; @@ -11458,7 +12138,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp40_ = _tmp39_->original_orientation; #line 1464 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp38_ != _tmp40_) { -#line 11460 "Photo.c" +#line 12140 "Photo.c" gchar** _tmp41_; gint _tmp41__length1; gchar* _tmp42_; @@ -11484,7 +12164,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp46_ = _tmp45_->original_orientation; #line 1466 "/home/jens/Source/shotwell/src/Photo.vala" _tmp44_->original_orientation = _tmp46_; -#line 11486 "Photo.c" +#line 12166 "Photo.c" } #line 1469 "/home/jens/Source/shotwell/src/Photo.vala" _tmp47_ = detected; @@ -11492,32 +12172,31 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp48_ = _tmp47_->metadata; #line 1469 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp48_ != NULL) { -#line 11494 "Photo.c" +#line 12174 "Photo.c" MetadataDateTime* date_time = NULL; DetectedPhotoInformation* _tmp49_; PhotoMetadata* _tmp50_; MetadataDateTime* _tmp51_; gboolean _tmp52_ = FALSE; MetadataDateTime* _tmp53_; - PhotoRow* _tmp60_; - const gchar* _tmp61_; - DetectedPhotoInformation* _tmp62_; - PhotoMetadata* _tmp63_; + PhotoRow* _tmp59_; + const gchar* _tmp60_; + DetectedPhotoInformation* _tmp61_; + PhotoMetadata* _tmp62_; + gchar* _tmp63_; gchar* _tmp64_; - gchar* _tmp65_; - gboolean _tmp66_; - PhotoRow* _tmp69_; - const gchar* _tmp70_; - DetectedPhotoInformation* _tmp71_; - PhotoMetadata* _tmp72_; + gboolean _tmp65_; + PhotoRow* _tmp68_; + const gchar* _tmp69_; + DetectedPhotoInformation* _tmp70_; + PhotoMetadata* _tmp71_; + gchar* _tmp72_; gchar* _tmp73_; - gchar* _tmp74_; - gboolean _tmp75_; - PhotoRow* _tmp78_; - Rating _tmp79_; - DetectedPhotoInformation* _tmp80_; - PhotoMetadata* _tmp81_; - Rating _tmp82_; + gboolean _tmp74_; + PhotoRow* _tmp77_; + Rating _tmp78_; + DetectedPhotoInformation* _tmp79_; + PhotoMetadata* _tmp80_; #line 1470 "/home/jens/Source/shotwell/src/Photo.vala" _tmp49_ = detected; #line 1470 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11530,11 +12209,10 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat _tmp53_ = date_time; #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp53_ != NULL) { -#line 11532 "Photo.c" +#line 12211 "Photo.c" PhotoRow* _tmp54_; time_t _tmp55_; MetadataDateTime* _tmp56_; - time_t _tmp57_; #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp54_ = updated_row; #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11542,288 +12220,278 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp56_ = date_time; #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = metadata_date_time_get_timestamp (_tmp56_); -#line 1471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = _tmp55_ != _tmp57_; -#line 11547 "Photo.c" + _tmp52_ = _tmp55_ != metadata_date_time_get_timestamp (_tmp56_); +#line 12223 "Photo.c" } else { #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" _tmp52_ = FALSE; -#line 11551 "Photo.c" +#line 12227 "Photo.c" } #line 1471 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp52_) { -#line 11555 "Photo.c" - gchar** _tmp58_; - gint _tmp58__length1; - gchar* _tmp59_; +#line 12231 "Photo.c" + gchar** _tmp57_; + gint _tmp57__length1; + gchar* _tmp58_; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = list; + _tmp57_ = list; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58__length1 = list_length1; + _tmp57__length1 = list_length1; #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = g_strdup ("metadata:exposure-time"); + _tmp58_ = g_strdup ("metadata:exposure-time"); #line 1472 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add94 (&list, &list_length1, &_list_size_, _tmp59_); -#line 11567 "Photo.c" + _vala_array_add94 (&list, &list_length1, &_list_size_, _tmp58_); +#line 12243 "Photo.c" } #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = updated_row; + _tmp59_ = updated_row; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _tmp60_->title; + _tmp60_ = _tmp59_->title; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = detected; + _tmp61_ = detected; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = _tmp62_->metadata; + _tmp62_ = _tmp61_->metadata; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp63_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = _tmp64_; + _tmp64_ = _tmp63_; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = g_strcmp0 (_tmp61_, _tmp65_) != 0; + _tmp65_ = g_strcmp0 (_tmp60_, _tmp64_) != 0; #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp65_); + _g_free0 (_tmp64_); #line 1474 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp66_) { -#line 11587 "Photo.c" - gchar** _tmp67_; - gint _tmp67__length1; - gchar* _tmp68_; + if (_tmp65_) { +#line 12263 "Photo.c" + gchar** _tmp66_; + gint _tmp66__length1; + gchar* _tmp67_; #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = list; + _tmp66_ = list; #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67__length1 = list_length1; + _tmp66__length1 = list_length1; #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = g_strdup ("metadata:name"); + _tmp67_ = g_strdup ("metadata:name"); #line 1475 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add95 (&list, &list_length1, &_list_size_, _tmp68_); -#line 11599 "Photo.c" + _vala_array_add95 (&list, &list_length1, &_list_size_, _tmp67_); +#line 12275 "Photo.c" } #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = updated_row; + _tmp68_ = updated_row; #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = _tmp69_->comment; + _tmp69_ = _tmp68_->comment; #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = detected; + _tmp70_ = detected; #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_->metadata; + _tmp71_ = _tmp70_->metadata; #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp72_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = _tmp73_; + _tmp73_ = _tmp72_; #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = g_strcmp0 (_tmp70_, _tmp74_) != 0; + _tmp74_ = g_strcmp0 (_tmp69_, _tmp73_) != 0; #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp74_); + _g_free0 (_tmp73_); #line 1477 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp75_) { -#line 11619 "Photo.c" - gchar** _tmp76_; - gint _tmp76__length1; - gchar* _tmp77_; + if (_tmp74_) { +#line 12295 "Photo.c" + gchar** _tmp75_; + gint _tmp75__length1; + gchar* _tmp76_; #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = list; + _tmp75_ = list; #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76__length1 = list_length1; + _tmp75__length1 = list_length1; #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = g_strdup ("metadata:comment"); + _tmp76_ = g_strdup ("metadata:comment"); #line 1478 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add96 (&list, &list_length1, &_list_size_, _tmp77_); -#line 11631 "Photo.c" + _vala_array_add96 (&list, &list_length1, &_list_size_, _tmp76_); +#line 12307 "Photo.c" } #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = updated_row; + _tmp77_ = updated_row; #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = _tmp78_->rating; + _tmp78_ = _tmp77_->rating; #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = detected; + _tmp79_ = detected; #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = _tmp80_->metadata; + _tmp80_ = _tmp79_->metadata; #line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = photo_metadata_get_rating (_tmp81_); -#line 1480 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp79_ != _tmp82_) { -#line 11645 "Photo.c" - gchar** _tmp83_; - gint _tmp83__length1; - gchar* _tmp84_; + if (_tmp78_ != photo_metadata_get_rating (_tmp80_)) { +#line 12319 "Photo.c" + gchar** _tmp81_; + gint _tmp81__length1; + gchar* _tmp82_; #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = list; + _tmp81_ = list; #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83__length1 = list_length1; + _tmp81__length1 = list_length1; #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = g_strdup ("metadata:rating"); + _tmp82_ = g_strdup ("metadata:rating"); #line 1481 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add97 (&list, &list_length1, &_list_size_, _tmp84_); -#line 11657 "Photo.c" + _vala_array_add97 (&list, &list_length1, &_list_size_, _tmp82_); +#line 12331 "Photo.c" } #line 1469 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 11661 "Photo.c" +#line 12335 "Photo.c" } #line 1484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = updated_row; + _tmp83_ = updated_row; #line 1484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = backing; + _tmp84_ = backing; #line 1484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = _backing_photo_row_ref0 (_tmp86_); + _tmp85_ = _backing_photo_row_ref0 (_tmp84_); #line 1484 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp85_->master); + _backing_photo_row_unref0 (_tmp83_->master); #line 1484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_->master = _tmp87_; + _tmp83_->master = _tmp85_; #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = updated_row; + _tmp86_ = updated_row; #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = detected; + _tmp87_ = detected; #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp89_->md5; + _tmp88_ = _tmp87_->md5; #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = g_strdup (_tmp90_); + _tmp89_ = g_strdup (_tmp88_); #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp88_->md5); + _g_free0 (_tmp86_->md5); #line 1485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_->md5 = _tmp91_; + _tmp86_->md5 = _tmp89_; #line 1486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = updated_row; + _tmp90_ = updated_row; #line 1486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = detected; + _tmp91_ = detected; #line 1486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = _tmp93_->exif_md5; + _tmp92_ = _tmp91_->exif_md5; #line 1486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = g_strdup (_tmp94_); + _tmp93_ = g_strdup (_tmp92_); #line 1486 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp92_->exif_md5); + _g_free0 (_tmp90_->exif_md5); #line 1486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_->exif_md5 = _tmp95_; + _tmp90_->exif_md5 = _tmp93_; #line 1487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = updated_row; + _tmp94_ = updated_row; #line 1487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = detected; + _tmp95_ = detected; #line 1487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = _tmp97_->thumbnail_md5; + _tmp96_ = _tmp95_->thumbnail_md5; #line 1487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = g_strdup (_tmp98_); + _tmp97_ = g_strdup (_tmp96_); #line 1487 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp96_->thumbnail_md5); + _g_free0 (_tmp94_->thumbnail_md5); #line 1487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_->thumbnail_md5 = _tmp99_; + _tmp94_->thumbnail_md5 = _tmp97_; #line 1489 "/home/jens/Source/shotwell/src/Photo.vala" metadata = NULL; #line 1490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = detected; + _tmp98_ = detected; #line 1490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = _tmp100_->metadata; + _tmp99_ = _tmp98_->metadata; #line 1490 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp101_ != NULL) { -#line 11717 "Photo.c" - DetectedPhotoInformation* _tmp102_; - PhotoMetadata* _tmp103_; - PhotoMetadata* _tmp104_; + if (_tmp99_ != NULL) { +#line 12391 "Photo.c" + DetectedPhotoInformation* _tmp100_; + PhotoMetadata* _tmp101_; + PhotoMetadata* _tmp102_; MetadataDateTime* date_time = NULL; - DetectedPhotoInformation* _tmp105_; - PhotoMetadata* _tmp106_; - MetadataDateTime* _tmp107_; - MetadataDateTime* _tmp108_; - PhotoRow* _tmp112_; - DetectedPhotoInformation* _tmp113_; - PhotoMetadata* _tmp114_; - gchar* _tmp115_; - PhotoRow* _tmp116_; - DetectedPhotoInformation* _tmp117_; - PhotoMetadata* _tmp118_; - gchar* _tmp119_; - PhotoRow* _tmp120_; - DetectedPhotoInformation* _tmp121_; - PhotoMetadata* _tmp122_; - Rating _tmp123_; + DetectedPhotoInformation* _tmp103_; + PhotoMetadata* _tmp104_; + MetadataDateTime* _tmp105_; + MetadataDateTime* _tmp106_; + PhotoRow* _tmp109_; + DetectedPhotoInformation* _tmp110_; + PhotoMetadata* _tmp111_; + gchar* _tmp112_; + PhotoRow* _tmp113_; + DetectedPhotoInformation* _tmp114_; + PhotoMetadata* _tmp115_; + gchar* _tmp116_; + PhotoRow* _tmp117_; + DetectedPhotoInformation* _tmp118_; + PhotoMetadata* _tmp119_; #line 1491 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = detected; + _tmp100_ = detected; #line 1491 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = _tmp102_->metadata; + _tmp101_ = _tmp100_->metadata; #line 1491 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = _media_metadata_ref0 (_tmp103_); + _tmp102_ = _media_metadata_ref0 (_tmp101_); #line 1491 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); #line 1491 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp104_; + metadata = _tmp102_; #line 1493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = detected; + _tmp103_ = detected; #line 1493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = _tmp105_->metadata; + _tmp104_ = _tmp103_->metadata; #line 1493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = photo_metadata_get_exposure_date_time (_tmp106_); + _tmp105_ = photo_metadata_get_exposure_date_time (_tmp104_); #line 1493 "/home/jens/Source/shotwell/src/Photo.vala" - date_time = _tmp107_; + date_time = _tmp105_; #line 1494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp108_ = date_time; + _tmp106_ = date_time; #line 1494 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp108_ != NULL) { -#line 11760 "Photo.c" - PhotoRow* _tmp109_; - MetadataDateTime* _tmp110_; - time_t _tmp111_; -#line 1495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_ = updated_row; + if (_tmp106_ != NULL) { +#line 12433 "Photo.c" + PhotoRow* _tmp107_; + MetadataDateTime* _tmp108_; #line 1495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_ = date_time; + _tmp107_ = updated_row; #line 1495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp111_ = metadata_date_time_get_timestamp (_tmp110_); + _tmp108_ = date_time; #line 1495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_->exposure_time = _tmp111_; -#line 11772 "Photo.c" + _tmp107_->exposure_time = metadata_date_time_get_timestamp (_tmp108_); +#line 12442 "Photo.c" } #line 1497 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_ = updated_row; + _tmp109_ = updated_row; #line 1497 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = detected; + _tmp110_ = detected; #line 1497 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = _tmp113_->metadata; + _tmp111_ = _tmp110_->metadata; #line 1497 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp112_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1497 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp112_->title); + _g_free0 (_tmp109_->title); #line 1497 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_->title = _tmp115_; + _tmp109_->title = _tmp112_; #line 1498 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_ = updated_row; + _tmp113_ = updated_row; #line 1498 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp117_ = detected; + _tmp114_ = detected; #line 1498 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_ = _tmp117_->metadata; + _tmp115_ = _tmp114_->metadata; #line 1498 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp119_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp116_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1498 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp116_->comment); + _g_free0 (_tmp113_->comment); #line 1498 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_->comment = _tmp119_; -#line 1499 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_ = updated_row; + _tmp113_->comment = _tmp116_; #line 1499 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp121_ = detected; + _tmp117_ = updated_row; #line 1499 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp122_ = _tmp121_->metadata; + _tmp118_ = detected; #line 1499 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp123_ = photo_metadata_get_rating (_tmp122_); + _tmp119_ = _tmp118_->metadata; #line 1499 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_->rating = _tmp123_; + _tmp117_->rating = photo_metadata_get_rating (_tmp119_); #line 1490 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 11810 "Photo.c" +#line 12478 "Photo.c" } #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_ = updated_row; + _tmp120_ = updated_row; #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp125_ = metadata; + _tmp121_ = metadata; #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126_ = list; + _tmp122_ = list; #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126__length1 = list_length1; + _tmp122__length1 = list_length1; #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp127_ = photo_reimport_master_state_impl_new (_tmp124_, _tmp125_, _tmp126_, _tmp126__length1); + _tmp123_ = photo_reimport_master_state_impl_new (_tmp120_, _tmp121_, _tmp122_, _tmp122__length1); #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); #line 1502 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); + _vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); #line 1504 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 1504 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11842,112 +12510,129 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat if (reimport_state) { #line 1504 "/home/jens/Source/shotwell/src/Photo.vala" *reimport_state = _vala_reimport_state; -#line 11844 "Photo.c" +#line 12512 "Photo.c" } else { #line 1504 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_reimport_state); -#line 11848 "Photo.c" +#line 12516 "Photo.c" } #line 1504 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 11852 "Photo.c" +#line 12520 "Photo.c" } -static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) { +static void +photo_real_apply_user_metadata_for_reimport (Photo* self, + PhotoMetadata* metadata) +{ #line 1507 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("Type `%s' does not implement abstract method `photo_apply_user_metadata_for_reimport'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 1507 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11861 "Photo.c" +#line 12532 "Photo.c" } -void photo_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) { +void +photo_apply_user_metadata_for_reimport (Photo* self, + PhotoMetadata* metadata) +{ #line 1507 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1507 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->apply_user_metadata_for_reimport (self, metadata); -#line 11870 "Photo.c" +#line 12544 "Photo.c" } -static gpointer _photo_reimport_master_state_ref0 (gpointer self) { +static gpointer +_photo_reimport_master_state_ref0 (gpointer self) +{ #line 1511 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_master_state_ref (self) : NULL; -#line 11877 "Photo.c" +#line 12553 "Photo.c" } -static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add98 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11888 "Photo.c" +#line 12569 "Photo.c" } #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11894 "Photo.c" +#line 12575 "Photo.c" } -static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add99 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 11905 "Photo.c" +#line 12591 "Photo.c" } #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 11911 "Photo.c" +#line 12597 "Photo.c" } -void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error) { +void +photo_finish_reimport_master (Photo* self, + PhotoReimportMasterState* state, + GError** error) +{ PhotoReimportMasterStateImpl* reimport_state = NULL; - PhotoReimportMasterState* _tmp0_; - PhotoReimportMasterStateImpl* _tmp1_; + PhotoReimportMasterStateImpl* _tmp0_; + PhotoTable* _tmp1_; PhotoTable* _tmp2_; - PhotoTable* _tmp3_; - PhotoRow* _tmp4_; - PhotoMetadata* _tmp20_; - gboolean _tmp22_; - gchar** _tmp28_; - gint _tmp28__length1; - PhotoMetadata* _tmp32_; - gboolean _tmp33_; - gboolean _tmp35_; + PhotoRow* _tmp3_; + PhotoMetadata* _tmp19_; + gboolean _tmp21_; + gchar** _tmp26_; + gint _tmp26__length1; + PhotoMetadata* _tmp30_; GError * _inner_error_ = NULL; #line 1510 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1510 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state)); #line 1511 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = state; -#line 1511 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _photo_reimport_master_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)); + _tmp0_ = _photo_reimport_master_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (state, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)); #line 1511 "/home/jens/Source/shotwell/src/Photo.vala" - reimport_state = _tmp1_; + reimport_state = _tmp0_; #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_table_get_instance (); + _tmp1_ = photo_table_get_instance (); #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = reimport_state->row; + _tmp3_ = reimport_state->row; #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_reimport (_tmp3_, _tmp4_, &_inner_error_); + photo_table_reimport (_tmp2_, _tmp3_, &_inner_error_); #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp3_); + _database_table_unref0 (_tmp2_); #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" @@ -11958,7 +12643,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, _photo_reimport_master_state_unref0 (reimport_state); #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11960 "Photo.c" +#line 12645 "Photo.c" } else { #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); @@ -11968,87 +12653,87 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, g_clear_error (&_inner_error_); #line 1513 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 11970 "Photo.c" +#line 12655 "Photo.c" } } { - PhotoRow* _tmp5_; + PhotoRow* _tmp4_; #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp4_ = self->row; #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 11979 "Photo.c" +#line 12664 "Photo.c" { BackingPhotoRow* original_master = NULL; - PhotoRow* _tmp6_; + PhotoRow* _tmp5_; + BackingPhotoRow* _tmp6_; BackingPhotoRow* _tmp7_; - BackingPhotoRow* _tmp8_; + PhotoRow* _tmp8_; PhotoRow* _tmp9_; PhotoRow* _tmp10_; - PhotoRow* _tmp11_; + BackingPhotoRow* _tmp11_; BackingPhotoRow* _tmp12_; - BackingPhotoRow* _tmp13_; - PhotoRow* _tmp14_; - BackingPhotoRow* _tmp15_; - PhotoRow* _tmp16_; - BackingPhotoRow* _tmp17_; - gboolean _tmp18_; + PhotoRow* _tmp13_; + BackingPhotoRow* _tmp14_; + PhotoRow* _tmp15_; + BackingPhotoRow* _tmp16_; + gboolean _tmp17_; #line 1517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 1517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_->master; + _tmp6_ = _tmp5_->master; #line 1517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _backing_photo_row_ref0 (_tmp7_); + _tmp7_ = _backing_photo_row_ref0 (_tmp6_); #line 1517 "/home/jens/Source/shotwell/src/Photo.vala" - original_master = _tmp8_; + original_master = _tmp7_; #line 1518 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = reimport_state->row; + _tmp8_ = reimport_state->row; #line 1518 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _photo_row_ref0 (_tmp9_); + _tmp9_ = _photo_row_ref0 (_tmp8_); #line 1518 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (self->row); #line 1518 "/home/jens/Source/shotwell/src/Photo.vala" - self->row = _tmp10_; + self->row = _tmp9_; #line 1519 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + _tmp10_ = self->row; #line 1519 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = original_master; + _tmp11_ = original_master; #line 1519 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _backing_photo_row_ref0 (_tmp12_); + _tmp12_ = _backing_photo_row_ref0 (_tmp11_); #line 1519 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp11_->master); + _backing_photo_row_unref0 (_tmp10_->master); #line 1519 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_->master = _tmp13_; + _tmp10_->master = _tmp12_; #line 1520 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp13_ = self->row; #line 1520 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->master; + _tmp14_ = _tmp13_->master; #line 1520 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = reimport_state->row; + _tmp15_ = reimport_state->row; #line 1520 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_->master; + _tmp16_ = _tmp15_->master; #line 1520 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_row_copy_from (_tmp15_, _tmp17_); + backing_photo_row_copy_from (_tmp14_, _tmp16_); #line 1521 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = reimport_state->metadata_only; + _tmp17_ = reimport_state->metadata_only; #line 1521 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp18_) { + if (!_tmp17_) { #line 1522 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 12037 "Photo.c" +#line 12722 "Photo.c" } #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (original_master); -#line 12041 "Photo.c" +#line 12726 "Photo.c" } __finally318: { - PhotoRow* _tmp19_; + PhotoRow* _tmp18_; #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp18_ = self->row; #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 12050 "Photo.c" +#line 12735 "Photo.c" } #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -12060,7 +12745,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, _photo_reimport_master_state_unref0 (reimport_state); #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12062 "Photo.c" +#line 12747 "Photo.c" } else { #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); @@ -12070,168 +12755,164 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, g_clear_error (&_inner_error_); #line 1515 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12072 "Photo.c" +#line 12757 "Photo.c" } } } #line 1525 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = reimport_state->metadata; + _tmp19_ = reimport_state->metadata; #line 1525 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp20_ != NULL) { -#line 12080 "Photo.c" - PhotoMetadata* _tmp21_; + if (_tmp19_ != NULL) { +#line 12765 "Photo.c" + PhotoMetadata* _tmp20_; #line 1526 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = reimport_state->metadata; + _tmp20_ = reimport_state->metadata; #line 1526 "/home/jens/Source/shotwell/src/Photo.vala" - photo_apply_user_metadata_for_reimport (self, _tmp21_); -#line 12086 "Photo.c" + photo_apply_user_metadata_for_reimport (self, _tmp20_); +#line 12771 "Photo.c" } #line 1528 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = reimport_state->metadata_only; + _tmp21_ = reimport_state->metadata_only; #line 1528 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp22_) { -#line 12092 "Photo.c" - gchar** _tmp23_; - gint _tmp23__length1; - gchar* _tmp24_; - gboolean _tmp25_; + if (!_tmp21_) { +#line 12777 "Photo.c" + gchar** _tmp22_; + gint _tmp22__length1; + gchar* _tmp23_; #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = reimport_state->alterations; + _tmp22_ = reimport_state->alterations; #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23__length1 = reimport_state->alterations_length1; + _tmp22__length1 = reimport_state->alterations_length1; #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = g_strdup ("image:master"); + _tmp23_ = g_strdup ("image:master"); #line 1529 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add98 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp24_); -#line 1530 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = photo_is_master_baseline (self); + _vala_array_add98 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp23_); #line 1530 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp25_) { -#line 12109 "Photo.c" - gchar** _tmp26_; - gint _tmp26__length1; - gchar* _tmp27_; + if (photo_is_master_baseline (self)) { +#line 12791 "Photo.c" + gchar** _tmp24_; + gint _tmp24__length1; + gchar* _tmp25_; #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = reimport_state->alterations; + _tmp24_ = reimport_state->alterations; #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26__length1 = reimport_state->alterations_length1; + _tmp24__length1 = reimport_state->alterations_length1; #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = g_strdup ("image:baseline"); + _tmp25_ = g_strdup ("image:baseline"); #line 1531 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add99 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp27_); -#line 12121 "Photo.c" + _vala_array_add99 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp25_); +#line 12803 "Photo.c" } } #line 1534 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = reimport_state->alterations; + _tmp26_ = reimport_state->alterations; #line 1534 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28__length1 = reimport_state->alterations_length1; + _tmp26__length1 = reimport_state->alterations_length1; #line 1534 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp28__length1 > 0) { -#line 12130 "Photo.c" - gchar** _tmp29_; - gint _tmp29__length1; - Alteration* _tmp30_; - Alteration* _tmp31_; + if (_tmp26__length1 > 0) { +#line 12812 "Photo.c" + gchar** _tmp27_; + gint _tmp27__length1; + Alteration* _tmp28_; + Alteration* _tmp29_; #line 1535 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = reimport_state->alterations; + _tmp27_ = reimport_state->alterations; #line 1535 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29__length1 = reimport_state->alterations_length1; + _tmp27__length1 = reimport_state->alterations_length1; #line 1535 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = alteration_new_from_array (_tmp29_, _tmp29__length1); + _tmp28_ = alteration_new_from_array (_tmp27_, _tmp27__length1); #line 1535 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp30_; + _tmp29_ = _tmp28_; #line 1535 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp31_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp29_); #line 1535 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp31_); -#line 12147 "Photo.c" + _alteration_unref0 (_tmp29_); +#line 12829 "Photo.c" } #line 1537 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = reimport_state->metadata; + _tmp30_ = reimport_state->metadata; #line 1537 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_master_reimported (self, _tmp32_); -#line 1539 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = photo_is_master_baseline (self); + photo_notify_master_reimported (self, _tmp30_); #line 1539 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp33_) { -#line 12157 "Photo.c" - PhotoMetadata* _tmp34_; + if (photo_is_master_baseline (self)) { +#line 12837 "Photo.c" + PhotoMetadata* _tmp31_; #line 1540 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = reimport_state->metadata; + _tmp31_ = reimport_state->metadata; #line 1540 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_baseline_reimported (self, _tmp34_); -#line 12163 "Photo.c" + photo_notify_baseline_reimported (self, _tmp31_); +#line 12843 "Photo.c" } #line 1542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo_is_master_source (self); -#line 1542 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp35_) { -#line 12169 "Photo.c" - PhotoMetadata* _tmp36_; + if (photo_is_master_source (self)) { +#line 12847 "Photo.c" + PhotoMetadata* _tmp32_; #line 1543 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = reimport_state->metadata; + _tmp32_ = reimport_state->metadata; #line 1543 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_source_reimported (self, _tmp36_); -#line 12175 "Photo.c" + photo_notify_source_reimported (self, _tmp32_); +#line 12853 "Photo.c" } #line 1510 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 12179 "Photo.c" +#line 12857 "Photo.c" } -static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow* * backing, DetectedPhotoInformation* * detected, GError** error) { +static gboolean +photo_verify_file_for_reimport (Photo* self, + GFile* file, + BackingPhotoRow* * backing, + DetectedPhotoInformation* * detected, + GError** error) +{ BackingPhotoRow* _vala_backing = NULL; DetectedPhotoInformation* _vala_detected = NULL; gboolean result = FALSE; BackingPhotoRow* _tmp0_ = NULL; - GFile* _tmp1_; - DetectedPhotoInformation* _tmp2_ = NULL; - BackingPhotoRow* _tmp3_; + DetectedPhotoInformation* _tmp1_ = NULL; + BackingPhotoRow* _tmp2_; + BackingPhotoRow* _tmp4_; BackingPhotoRow* _tmp5_; - BackingPhotoRow* _tmp6_; + gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; - DetectedPhotoInformation* _tmp9_; - GdkColorspace _tmp10_; + DetectedPhotoInformation* _tmp8_; + GdkColorspace _tmp9_; GError * _inner_error_ = NULL; #line 1547 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 1547 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file; -#line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_query_backing_photo_row (self, _tmp1_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp2_, &_inner_error_); + _tmp2_ = photo_query_backing_photo_row (self, file, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp1_, &_inner_error_); #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_detected = _tmp2_; + _vala_detected = _tmp1_; #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_; + _tmp0_ = _tmp2_; #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12214 "Photo.c" - gboolean _tmp4_ = FALSE; +#line 12895 "Photo.c" + gboolean _tmp3_ = FALSE; #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp4_; -#line 12220 "Photo.c" + return _tmp3_; +#line 12901 "Photo.c" } #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp0_; + _tmp4_ = _tmp0_; #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); #line 1549 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_backing = _tmp5_; + _vala_backing = _tmp4_; #line 1551 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _vala_backing; + _tmp5_ = _vala_backing; #line 1551 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_ == NULL) { + if (_tmp5_ == NULL) { #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12240,78 +12921,75 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin if (backing) { #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12242 "Photo.c" +#line 12923 "Photo.c" } else { #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12246 "Photo.c" +#line 12927 "Photo.c" } #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12252 "Photo.c" +#line 12933 "Photo.c" } else { #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12256 "Photo.c" +#line 12937 "Photo.c" } #line 1552 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12260 "Photo.c" +#line 12941 "Photo.c" } #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _vala_detected; + _tmp8_ = _vala_detected; #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_->colorspace; + _tmp9_ = _tmp8_->colorspace; #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_ != GDK_COLORSPACE_RGB) { + if (_tmp9_ != GDK_COLORSPACE_RGB) { #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = TRUE; -#line 12270 "Photo.c" + _tmp7_ = TRUE; +#line 12951 "Photo.c" } else { - DetectedPhotoInformation* _tmp11_; - gint _tmp12_; + DetectedPhotoInformation* _tmp10_; + gint _tmp11_; #line 1557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _vala_detected; + _tmp10_ = _vala_detected; #line 1557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_->channels; + _tmp11_ = _tmp10_->channels; #line 1557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp12_ < 3; -#line 12280 "Photo.c" + _tmp7_ = _tmp11_ < 3; +#line 12961 "Photo.c" } #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { + if (_tmp7_) { #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = TRUE; -#line 12286 "Photo.c" + _tmp6_ = TRUE; +#line 12967 "Photo.c" } else { - DetectedPhotoInformation* _tmp13_; - gint _tmp14_; + DetectedPhotoInformation* _tmp12_; + gint _tmp13_; #line 1558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _vala_detected; + _tmp12_ = _vala_detected; #line 1558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->bits_per_channel; + _tmp13_ = _tmp12_->bits_per_channel; #line 1558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp14_ != 8; -#line 12296 "Photo.c" + _tmp6_ = _tmp13_ != 8; +#line 12977 "Photo.c" } #line 1556 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_) { -#line 12300 "Photo.c" - GFile* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; -#line 1559 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = file; + if (_tmp6_) { +#line 12981 "Photo.c" + gchar* _tmp14_; + gchar* _tmp15_; #line 1559 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = g_file_get_path (_tmp15_); + _tmp14_ = g_file_get_path (file); #line 1559 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 1559 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:1559: Not re-importing %s: Unsupported color format", _tmp17_); + g_warning ("Photo.vala:1559: Not re-importing %s: Unsupported color format", _tmp15_); #line 1559 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp15_); #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12320,25 +12998,25 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin if (backing) { #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12322 "Photo.c" +#line 13000 "Photo.c" } else { #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12326 "Photo.c" +#line 13004 "Photo.c" } #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12332 "Photo.c" +#line 13010 "Photo.c" } else { #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12336 "Photo.c" +#line 13014 "Photo.c" } #line 1561 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12340 "Photo.c" +#line 13018 "Photo.c" } #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -12348,29 +13026,33 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin if (backing) { #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" *backing = _vala_backing; -#line 12350 "Photo.c" +#line 13028 "Photo.c" } else { #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (_vala_backing); -#line 12354 "Photo.c" +#line 13032 "Photo.c" } #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" if (detected) { #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" *detected = _vala_detected; -#line 12360 "Photo.c" +#line 13038 "Photo.c" } else { #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (_vala_detected); -#line 12364 "Photo.c" +#line 13042 "Photo.c" } #line 1564 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12368 "Photo.c" +#line 13046 "Photo.c" } -gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState* * state, GError** error) { +gboolean +photo_prepare_for_reimport_editable (Photo* self, + PhotoReimportEditableState* * state, + GError** error) +{ PhotoReimportEditableState* _vala_state = NULL; gboolean result = FALSE; GFile* file = NULL; @@ -12410,15 +13092,15 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable if (state) { #line 1573 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12412 "Photo.c" +#line 13094 "Photo.c" } else { #line 1573 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12416 "Photo.c" +#line 13098 "Photo.c" } #line 1573 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12420 "Photo.c" +#line 13102 "Photo.c" } #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; @@ -12436,7 +13118,7 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable _tmp2_ = _tmp6_; #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12438 "Photo.c" +#line 13120 "Photo.c" gboolean _tmp7_ = FALSE; #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); @@ -12448,7 +13130,7 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable _g_object_unref0 (file); #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp7_; -#line 12450 "Photo.c" +#line 13132 "Photo.c" } #line 1577 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp2_) { @@ -12464,15 +13146,15 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable if (state) { #line 1578 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12466 "Photo.c" +#line 13148 "Photo.c" } else { #line 1578 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12470 "Photo.c" +#line 13152 "Photo.c" } #line 1578 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12474 "Photo.c" +#line 13156 "Photo.c" } #line 1580 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = backing; @@ -12498,47 +13180,49 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable if (state) { #line 1582 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12500 "Photo.c" +#line 13182 "Photo.c" } else { #line 1582 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 12504 "Photo.c" +#line 13186 "Photo.c" } #line 1582 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12508 "Photo.c" +#line 13190 "Photo.c" } -static gpointer _photo_reimport_editable_state_ref0 (gpointer self) { +static gpointer +_photo_reimport_editable_state_ref0 (gpointer self) +{ #line 1591 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_editable_state_ref (self) : NULL; -#line 12515 "Photo.c" +#line 13199 "Photo.c" } -void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* state, GError** error) { +void +photo_finish_reimport_editable (Photo* self, + PhotoReimportEditableState* state, + GError** error) +{ BackingPhotoID editable_id = {0}; BackingPhotoID _tmp0_ = {0}; - gboolean _tmp1_; PhotoReimportEditableStateImpl* reimport_state = NULL; - PhotoReimportEditableState* _tmp2_; - PhotoReimportEditableStateImpl* _tmp3_; - PhotoReimportEditableStateImpl* _tmp4_; - gboolean _tmp5_; - PhotoReimportEditableStateImpl* _tmp21_; - PhotoMetadata* _tmp22_; + PhotoReimportEditableStateImpl* _tmp1_; + PhotoReimportEditableStateImpl* _tmp2_; + gboolean _tmp3_; + PhotoReimportEditableStateImpl* _tmp19_; + PhotoMetadata* _tmp20_; gchar* list = NULL; - gchar* _tmp36_; - PhotoReimportEditableStateImpl* _tmp37_; - gboolean _tmp38_; - const gchar* _tmp41_; - Alteration* _tmp42_; - Alteration* _tmp43_; - PhotoReimportEditableStateImpl* _tmp44_; - PhotoMetadata* _tmp45_; - gboolean _tmp46_; - gboolean _tmp49_; + gchar* _tmp33_; + PhotoReimportEditableStateImpl* _tmp34_; + gboolean _tmp35_; + const gchar* _tmp38_; + Alteration* _tmp39_; + Alteration* _tmp40_; + PhotoReimportEditableStateImpl* _tmp41_; + PhotoMetadata* _tmp42_; GError * _inner_error_ = NULL; #line 1586 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -12549,42 +13233,38 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st #line 1587 "/home/jens/Source/shotwell/src/Photo.vala" editable_id = _tmp0_; #line 1588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = backing_photo_id_is_invalid (&editable_id); -#line 1588 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { + if (backing_photo_id_is_invalid (&editable_id)) { #line 1589 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12556 "Photo.c" +#line 13238 "Photo.c" } #line 1591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = state; -#line 1591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _photo_reimport_editable_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)); + _tmp1_ = _photo_reimport_editable_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (state, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)); #line 1591 "/home/jens/Source/shotwell/src/Photo.vala" - reimport_state = _tmp3_; + reimport_state = _tmp1_; #line 1593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = reimport_state; + _tmp2_ = reimport_state; #line 1593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->metadata_only; + _tmp3_ = _tmp2_->metadata_only; #line 1593 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp5_) { -#line 12570 "Photo.c" - BackingPhotoTable* _tmp6_; - BackingPhotoTable* _tmp7_; - PhotoReimportEditableStateImpl* _tmp8_; - BackingPhotoRow* _tmp9_; + if (!_tmp3_) { +#line 13250 "Photo.c" + BackingPhotoTable* _tmp4_; + BackingPhotoTable* _tmp5_; + PhotoReimportEditableStateImpl* _tmp6_; + BackingPhotoRow* _tmp7_; #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = backing_photo_table_get_instance (); + _tmp4_ = backing_photo_table_get_instance (); #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = reimport_state; + _tmp6_ = reimport_state; #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_->backing_state; + _tmp7_ = _tmp6_->backing_state; #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_update (_tmp7_, _tmp9_, &_inner_error_); + backing_photo_table_update (_tmp5_, _tmp7_, &_inner_error_); #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp7_); + _database_table_unref0 (_tmp5_); #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12595,7 +13275,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _photo_reimport_editable_state_unref0 (reimport_state); #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12597 "Photo.c" +#line 13277 "Photo.c" } else { #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); @@ -12605,53 +13285,53 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st g_clear_error (&_inner_error_); #line 1594 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12607 "Photo.c" +#line 13287 "Photo.c" } } { - PhotoRow* _tmp10_; + PhotoRow* _tmp8_; #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->row; + _tmp8_ = self->row; #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 12616 "Photo.c" +#line 13296 "Photo.c" { - PhotoReimportEditableStateImpl* _tmp11_; - BackingPhotoRow* _tmp12_; + PhotoReimportEditableStateImpl* _tmp9_; + BackingPhotoRow* _tmp10_; + BackingPhotoRow* _tmp11_; + PhotoReimportEditableStateImpl* _tmp12_; BackingPhotoRow* _tmp13_; - PhotoReimportEditableStateImpl* _tmp14_; - BackingPhotoRow* _tmp15_; - Orientation _tmp16_; + Orientation _tmp14_; #line 1597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = reimport_state; + _tmp9_ = reimport_state; #line 1597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_->backing_state; + _tmp10_ = _tmp9_->backing_state; #line 1597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _backing_photo_row_ref0 (_tmp12_); + _tmp11_ = _backing_photo_row_ref0 (_tmp10_); #line 1597 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); #line 1597 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->editable = _tmp13_; + self->priv->editable = _tmp11_; #line 1598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = reimport_state; + _tmp12_ = reimport_state; #line 1598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->backing_state; + _tmp13_ = _tmp12_->backing_state; #line 1598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_->original_orientation; + _tmp14_ = _tmp13_->original_orientation; #line 1598 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_orientation (self, _tmp16_); + photo_set_orientation (self, _tmp14_); #line 1599 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 12644 "Photo.c" +#line 13324 "Photo.c" } __finally319: { - PhotoRow* _tmp17_; + PhotoRow* _tmp15_; #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = self->row; + _tmp15_ = self->row; #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 12653 "Photo.c" +#line 13333 "Photo.c" } #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -12663,7 +13343,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st _photo_reimport_editable_state_unref0 (reimport_state); #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12665 "Photo.c" +#line 13345 "Photo.c" } else { #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); @@ -12673,169 +13353,168 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st g_clear_error (&_inner_error_); #line 1596 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 12675 "Photo.c" +#line 13355 "Photo.c" } } } } else { - PhotoReimportEditableStateImpl* _tmp18_; - BackingPhotoRow* _tmp19_; - Orientation _tmp20_; + PhotoReimportEditableStateImpl* _tmp16_; + BackingPhotoRow* _tmp17_; + Orientation _tmp18_; #line 1602 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = reimport_state; + _tmp16_ = reimport_state; #line 1602 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->backing_state; + _tmp17_ = _tmp16_->backing_state; #line 1602 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_->original_orientation; + _tmp18_ = _tmp17_->original_orientation; #line 1602 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_orientation (self, _tmp20_); -#line 12691 "Photo.c" + photo_set_orientation (self, _tmp18_); +#line 13371 "Photo.c" } #line 1605 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = reimport_state; + _tmp19_ = reimport_state; #line 1605 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->metadata; + _tmp20_ = _tmp19_->metadata; #line 1605 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_ != NULL) { -#line 12699 "Photo.c" - PhotoReimportEditableStateImpl* _tmp23_; - PhotoMetadata* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - PhotoReimportEditableStateImpl* _tmp27_; - PhotoMetadata* _tmp28_; - gchar* _tmp29_; - gchar* _tmp30_; + if (_tmp20_ != NULL) { +#line 13379 "Photo.c" + PhotoReimportEditableStateImpl* _tmp21_; + PhotoMetadata* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + PhotoReimportEditableStateImpl* _tmp25_; + PhotoMetadata* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + PhotoReimportEditableStateImpl* _tmp29_; + PhotoMetadata* _tmp30_; PhotoReimportEditableStateImpl* _tmp31_; PhotoMetadata* _tmp32_; - Rating _tmp33_; - PhotoReimportEditableStateImpl* _tmp34_; - PhotoMetadata* _tmp35_; #line 1606 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = reimport_state; + _tmp21_ = reimport_state; #line 1606 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_->metadata; + _tmp22_ = _tmp21_->metadata; #line 1606 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp23_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1606 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _tmp23_; #line 1606 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp26_); + media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp24_); #line 1606 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp24_); #line 1607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = reimport_state; + _tmp25_ = reimport_state; #line 1607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_->metadata; + _tmp26_ = _tmp25_->metadata; #line 1607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_METADATA, MediaMetadata)); + _tmp27_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_METADATA, MediaMetadata)); #line 1607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_; + _tmp28_ = _tmp27_; #line 1607 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp30_); + media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp28_); #line 1607 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp30_); -#line 1608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = reimport_state; + _g_free0 (_tmp28_); #line 1608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_->metadata; + _tmp29_ = reimport_state; #line 1608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = photo_metadata_get_rating (_tmp32_); + _tmp30_ = _tmp29_->metadata; #line 1608 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp33_); + media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), photo_metadata_get_rating (_tmp30_)); #line 1609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = reimport_state; + _tmp31_ = reimport_state; #line 1609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_->metadata; + _tmp32_ = _tmp31_->metadata; #line 1609 "/home/jens/Source/shotwell/src/Photo.vala" - photo_apply_user_metadata_for_reimport (self, _tmp35_); -#line 12751 "Photo.c" + photo_apply_user_metadata_for_reimport (self, _tmp32_); +#line 13428 "Photo.c" } #line 1612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); + _tmp33_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); #line 1612 "/home/jens/Source/shotwell/src/Photo.vala" - list = _tmp36_; + list = _tmp33_; #line 1613 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = reimport_state; + _tmp34_ = reimport_state; #line 1613 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp37_->metadata_only; + _tmp35_ = _tmp34_->metadata_only; #line 1613 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp38_) { -#line 12763 "Photo.c" - const gchar* _tmp39_; - gchar* _tmp40_; + if (!_tmp35_) { +#line 13440 "Photo.c" + const gchar* _tmp36_; + gchar* _tmp37_; #line 1614 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = list; + _tmp36_ = list; #line 1614 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = g_strconcat (_tmp39_, "image:editable,image:baseline", NULL); + _tmp37_ = g_strconcat (_tmp36_, "image:editable,image:baseline", NULL); #line 1614 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); #line 1614 "/home/jens/Source/shotwell/src/Photo.vala" - list = _tmp40_; -#line 12774 "Photo.c" + list = _tmp37_; +#line 13451 "Photo.c" } #line 1616 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = list; + _tmp38_ = list; #line 1616 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = alteration_new_from_list (_tmp41_); + _tmp39_ = alteration_new_from_list (_tmp38_); #line 1616 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp42_; + _tmp40_ = _tmp39_; #line 1616 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp43_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp40_); #line 1616 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp43_); + _alteration_unref0 (_tmp40_); #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = reimport_state; + _tmp41_ = reimport_state; #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _tmp44_->metadata; + _tmp42_ = _tmp41_->metadata; #line 1618 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_editable_reimported (self, _tmp45_); -#line 1620 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = photo_is_editable_baseline (self); + photo_notify_editable_reimported (self, _tmp42_); #line 1620 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp46_) { -#line 12796 "Photo.c" - PhotoReimportEditableStateImpl* _tmp47_; - PhotoMetadata* _tmp48_; + if (photo_is_editable_baseline (self)) { +#line 13471 "Photo.c" + PhotoReimportEditableStateImpl* _tmp43_; + PhotoMetadata* _tmp44_; #line 1621 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = reimport_state; + _tmp43_ = reimport_state; #line 1621 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp47_->metadata; + _tmp44_ = _tmp43_->metadata; #line 1621 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_baseline_reimported (self, _tmp48_); -#line 12805 "Photo.c" + photo_notify_baseline_reimported (self, _tmp44_); +#line 13480 "Photo.c" } #line 1623 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = photo_is_editable_source (self); -#line 1623 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp49_) { -#line 12811 "Photo.c" - PhotoReimportEditableStateImpl* _tmp50_; - PhotoMetadata* _tmp51_; + if (photo_is_editable_source (self)) { +#line 13484 "Photo.c" + PhotoReimportEditableStateImpl* _tmp45_; + PhotoMetadata* _tmp46_; #line 1624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = reimport_state; + _tmp45_ = reimport_state; #line 1624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _tmp50_->metadata; + _tmp46_ = _tmp45_->metadata; #line 1624 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_source_reimported (self, _tmp51_); -#line 12820 "Photo.c" + photo_notify_source_reimported (self, _tmp46_); +#line 13493 "Photo.c" } #line 1586 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); #line 1586 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (reimport_state); -#line 12826 "Photo.c" +#line 13499 "Photo.c" } -static gpointer _photo_reimport_raw_development_state_ref0 (gpointer self) { +static gpointer +_photo_reimport_raw_development_state_ref0 (gpointer self) +{ #line 1646 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_reimport_raw_development_state_ref (self) : NULL; -#line 12833 "Photo.c" +#line 13508 "Photo.c" } -gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* * state, GError** error) { +gboolean +photo_prepare_for_reimport_raw_development (Photo* self, + PhotoReimportRawDevelopmentState* * state, + GError** error) +{ PhotoReimportRawDevelopmentState* _vala_state = NULL; gboolean result = FALSE; GeeCollection* files = NULL; @@ -12843,10 +13522,9 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR GeeCollection* _tmp1_; PhotoReimportRawDevelopmentStateImpl* reimport_state = NULL; PhotoReimportRawDevelopmentStateImpl* _tmp2_; - PhotoReimportRawDevelopmentStateImpl* _tmp19_; - PhotoReimportRawDevelopmentState* _tmp20_; - PhotoReimportRawDevelopmentStateImpl* _tmp21_; - gint _tmp22_; + PhotoReimportRawDevelopmentStateImpl* _tmp18_; + PhotoReimportRawDevelopmentState* _tmp19_; + PhotoReimportRawDevelopmentStateImpl* _tmp20_; GError * _inner_error_ = NULL; #line 1628 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -12870,21 +13548,21 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR if (state) { #line 1633 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 12872 "Photo.c" +#line 13550 "Photo.c" } else { #line 1633 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 12876 "Photo.c" +#line 13554 "Photo.c" } #line 1633 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 12880 "Photo.c" +#line 13558 "Photo.c" } #line 1635 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = photo_reimport_raw_development_state_impl_new (); #line 1635 "/home/jens/Source/shotwell/src/Photo.vala" reimport_state = _tmp2_; -#line 12886 "Photo.c" +#line 13564 "Photo.c" { GeeIterator* _file_it = NULL; GeeCollection* _tmp3_; @@ -12897,57 +13575,54 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR _file_it = _tmp4_; #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 12899 "Photo.c" +#line 13577 "Photo.c" GeeIterator* _tmp5_; - gboolean _tmp6_; GFile* file = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; + GeeIterator* _tmp6_; + gpointer _tmp7_; DetectedPhotoInformation* detected = NULL; BackingPhotoRow* backing = NULL; - gboolean _tmp9_ = FALSE; - GFile* _tmp10_; - BackingPhotoRow* _tmp11_ = NULL; - DetectedPhotoInformation* _tmp12_ = NULL; - gboolean _tmp13_; - PhotoReimportRawDevelopmentStateImpl* _tmp15_; - BackingPhotoRow* _tmp16_; - DetectedPhotoInformation* _tmp17_; - PhotoMetadata* _tmp18_; + gboolean _tmp8_ = FALSE; + GFile* _tmp9_; + BackingPhotoRow* _tmp10_ = NULL; + DetectedPhotoInformation* _tmp11_ = NULL; + gboolean _tmp12_; + PhotoReimportRawDevelopmentStateImpl* _tmp14_; + BackingPhotoRow* _tmp15_; + DetectedPhotoInformation* _tmp16_; + PhotoMetadata* _tmp17_; #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _file_it; #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterator_next (_tmp5_); -#line 1637 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp5_)) { #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 12924 "Photo.c" +#line 13599 "Photo.c" } #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _file_it; + _tmp6_ = _file_it; #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" - file = (GFile*) _tmp8_; + file = (GFile*) _tmp7_; #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = file; + _tmp9_ = file; #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_verify_file_for_reimport (self, _tmp10_, &_tmp11_, &_tmp12_, &_inner_error_); + _tmp12_ = photo_verify_file_for_reimport (self, _tmp9_, &_tmp10_, &_tmp11_, &_inner_error_); #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - backing = _tmp11_; + backing = _tmp10_; #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - detected = _tmp12_; + detected = _tmp11_; #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp13_; + _tmp8_ = _tmp12_; #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12948 "Photo.c" - gboolean _tmp14_ = FALSE; +#line 13623 "Photo.c" + gboolean _tmp13_ = FALSE; #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12963,11 +13638,11 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (files); #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp14_; -#line 12966 "Photo.c" + return _tmp13_; +#line 13641 "Photo.c" } #line 1640 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp9_) { + if (!_tmp8_) { #line 1641 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); #line 1641 "/home/jens/Source/shotwell/src/Photo.vala" @@ -12976,44 +13651,42 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR _g_object_unref0 (file); #line 1641 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 12978 "Photo.c" +#line 13653 "Photo.c" } #line 1643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = reimport_state; + _tmp14_ = reimport_state; #line 1643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = backing; + _tmp15_ = backing; #line 1643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = detected; + _tmp16_ = detected; #line 1643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_->metadata; + _tmp17_ = _tmp16_->metadata; #line 1643 "/home/jens/Source/shotwell/src/Photo.vala" - photo_reimport_raw_development_state_impl_add (_tmp15_, _tmp16_, _tmp18_); + photo_reimport_raw_development_state_impl_add (_tmp14_, _tmp15_, _tmp17_); #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (backing); #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 12996 "Photo.c" +#line 13671 "Photo.c" } #line 1637 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_file_it); -#line 13000 "Photo.c" +#line 13675 "Photo.c" } #line 1646 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = reimport_state; + _tmp18_ = reimport_state; #line 1646 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState)); + _tmp19_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState)); #line 1646 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); #line 1646 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = _tmp20_; + _vala_state = _tmp19_; #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = reimport_state; + _tmp20_ = reimport_state; #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo_reimport_raw_development_state_impl_get_size (_tmp21_); -#line 1647 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp22_ > 0; + result = photo_reimport_raw_development_state_impl_get_size (_tmp20_) > 0; #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13022,112 +13695,107 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR if (state) { #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 13024 "Photo.c" +#line 13697 "Photo.c" } else { #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (_vala_state); -#line 13028 "Photo.c" +#line 13701 "Photo.c" } #line 1647 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13032 "Photo.c" +#line 13705 "Photo.c" } -void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* state, GError** error) { - PhotoFileFormat _tmp0_; +void +photo_finish_reimport_raw_development (Photo* self, + PhotoReimportRawDevelopmentState* state, + GError** error) +{ PhotoReimportRawDevelopmentStateImpl* reimport_state = NULL; - PhotoReimportRawDevelopmentState* _tmp1_; - PhotoReimportRawDevelopmentStateImpl* _tmp2_; + PhotoReimportRawDevelopmentStateImpl* _tmp0_; gchar* list = NULL; - gchar* _tmp32_; - PhotoReimportRawDevelopmentStateImpl* _tmp33_; - gboolean _tmp34_; - const gchar* _tmp37_; - Alteration* _tmp38_; - Alteration* _tmp39_; + gchar* _tmp29_; + PhotoReimportRawDevelopmentStateImpl* _tmp30_; + gboolean _tmp31_; + const gchar* _tmp34_; + Alteration* _tmp35_; + Alteration* _tmp36_; GError * _inner_error_ = NULL; #line 1651 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1651 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE (state)); #line 1652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_get_master_file_format (self); -#line 1652 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { + if (photo_get_master_file_format (self) != PHOTO_FILE_FORMAT_RAW) { #line 1653 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13059 "Photo.c" +#line 13732 "Photo.c" } #line 1655 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = state; + _tmp0_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (state, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl)); #line 1655 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl)); -#line 1655 "/home/jens/Source/shotwell/src/Photo.vala" - reimport_state = _tmp2_; -#line 13067 "Photo.c" + reimport_state = _tmp0_; +#line 13738 "Photo.c" { GeeIterator* _dev_it = NULL; - PhotoReimportRawDevelopmentStateImpl* _tmp3_; - GeeCollection* _tmp4_; - GeeIterator* _tmp5_; + PhotoReimportRawDevelopmentStateImpl* _tmp1_; + GeeCollection* _tmp2_; + GeeIterator* _tmp3_; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = reimport_state; + _tmp1_ = reimport_state; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_->list; + _tmp2_ = _tmp1_->list; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _dev_it = _tmp5_; + _dev_it = _tmp3_; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 13083 "Photo.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 13754 "Photo.c" + GeeIterator* _tmp4_; PhotoReimportRawDevelopmentStateImplDevToReimport* dev = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - PhotoReimportRawDevelopmentStateImpl* _tmp10_; - gboolean _tmp11_; -#line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _dev_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + PhotoReimportRawDevelopmentStateImpl* _tmp7_; + gboolean _tmp8_; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp4_ = _dev_it; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp4_)) { #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 13099 "Photo.c" +#line 13767 "Photo.c" } #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _dev_it; + _tmp5_ = _dev_it; #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" - dev = (PhotoReimportRawDevelopmentStateImplDevToReimport*) _tmp9_; + dev = (PhotoReimportRawDevelopmentStateImplDevToReimport*) _tmp6_; #line 1658 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = reimport_state; + _tmp7_ = reimport_state; #line 1658 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_->metadata_only; + _tmp8_ = _tmp7_->metadata_only; #line 1658 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp11_) { -#line 13113 "Photo.c" - BackingPhotoTable* _tmp12_; - BackingPhotoTable* _tmp13_; - PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_; - BackingPhotoRow* _tmp15_; + if (!_tmp8_) { +#line 13781 "Photo.c" + BackingPhotoTable* _tmp9_; + BackingPhotoTable* _tmp10_; + PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp11_; + BackingPhotoRow* _tmp12_; #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = backing_photo_table_get_instance (); + _tmp9_ = backing_photo_table_get_instance (); #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = dev; + _tmp11_ = dev; #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->backing; + _tmp12_ = _tmp11_->backing; #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_update (_tmp13_, _tmp15_, &_inner_error_); + backing_photo_table_update (_tmp10_, _tmp12_, &_inner_error_); #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp13_); + _database_table_unref0 (_tmp10_); #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13142,7 +13810,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _photo_reimport_raw_development_state_unref0 (reimport_state); #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13144 "Photo.c" +#line 13812 "Photo.c" } else { #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); @@ -13156,113 +13824,113 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop g_clear_error (&_inner_error_); #line 1659 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13158 "Photo.c" +#line 13826 "Photo.c" } } { - PhotoRow* _tmp16_; + PhotoRow* _tmp13_; #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->row; + _tmp13_ = self->row; #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 13167 "Photo.c" +#line 13835 "Photo.c" { - gint _tmp17_; - RawDeveloper* _tmp18_; + gint _tmp14_; + RawDeveloper* _tmp15_; #line 1663 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = raw_developer_as_array (&_tmp17_); -#line 13173 "Photo.c" + _tmp15_ = raw_developer_as_array (&_tmp14_); +#line 13841 "Photo.c" { RawDeveloper* d_collection = NULL; gint d_collection_length1 = 0; gint _d_collection_size_ = 0; gint d_it = 0; #line 1663 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection = _tmp18_; + d_collection = _tmp15_; #line 1663 "/home/jens/Source/shotwell/src/Photo.vala" - d_collection_length1 = _tmp17_; + d_collection_length1 = _tmp14_; #line 1663 "/home/jens/Source/shotwell/src/Photo.vala" - for (d_it = 0; d_it < _tmp17_; d_it = d_it + 1) { -#line 13185 "Photo.c" + for (d_it = 0; d_it < _tmp14_; d_it = d_it + 1) { +#line 13853 "Photo.c" RawDeveloper d = 0; #line 1663 "/home/jens/Source/shotwell/src/Photo.vala" d = d_collection[d_it]; -#line 13189 "Photo.c" +#line 13857 "Photo.c" { BackingPhotoID id = {0}; - PhotoRow* _tmp19_; - BackingPhotoID* _tmp20_; - gint _tmp20__length1; - RawDeveloper _tmp21_; - BackingPhotoID _tmp22_; - BackingPhotoID _tmp23_; - gint64 _tmp24_; + PhotoRow* _tmp16_; + BackingPhotoID* _tmp17_; + gint _tmp17__length1; + RawDeveloper _tmp18_; + BackingPhotoID _tmp19_; + BackingPhotoID _tmp20_; + gint64 _tmp21_; #line 1664 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp16_ = self->row; #line 1664 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_->development_ids; + _tmp17_ = _tmp16_->development_ids; #line 1664 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20__length1 = _tmp19_->development_ids_length1; + _tmp17__length1 = _tmp16_->development_ids_length1; #line 1664 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = d; + _tmp18_ = d; #line 1664 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp20_[_tmp21_]; + _tmp19_ = _tmp17_[_tmp18_]; #line 1664 "/home/jens/Source/shotwell/src/Photo.vala" - id = _tmp22_; + id = _tmp19_; #line 1665 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = id; + _tmp20_ = id; #line 1665 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_.id; + _tmp21_ = _tmp20_.id; #line 1665 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp24_ != BACKING_PHOTO_ID_INVALID) { -#line 13217 "Photo.c" + if (_tmp21_ != BACKING_PHOTO_ID_INVALID) { +#line 13885 "Photo.c" BackingPhotoRow* bpr = NULL; - BackingPhotoID _tmp25_; - BackingPhotoRow* _tmp26_; - BackingPhotoRow* _tmp27_; + BackingPhotoID _tmp22_; + BackingPhotoRow* _tmp23_; + BackingPhotoRow* _tmp24_; #line 1666 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = id; + _tmp22_ = id; #line 1666 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_get_backing_row (self, &_tmp25_); + _tmp23_ = photo_get_backing_row (self, &_tmp22_); #line 1666 "/home/jens/Source/shotwell/src/Photo.vala" - bpr = _tmp26_; + bpr = _tmp23_; #line 1667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = bpr; + _tmp24_ = bpr; #line 1667 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp27_ != NULL) { -#line 13232 "Photo.c" - GeeHashMap* _tmp28_; - RawDeveloper _tmp29_; - BackingPhotoRow* _tmp30_; + if (_tmp24_ != NULL) { +#line 13900 "Photo.c" + GeeHashMap* _tmp25_; + RawDeveloper _tmp26_; + BackingPhotoRow* _tmp27_; #line 1668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = self->priv->developments; + _tmp25_ = self->priv->developments; #line 1668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = d; + _tmp26_ = d; #line 1668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = bpr; + _tmp27_ = bpr; #line 1668 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp29_), _tmp30_); -#line 13244 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp26_), _tmp27_); +#line 13912 "Photo.c" } #line 1665 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (bpr); -#line 13248 "Photo.c" +#line 13916 "Photo.c" } } } #line 1663 "/home/jens/Source/shotwell/src/Photo.vala" d_collection = (g_free (d_collection), NULL); -#line 13254 "Photo.c" +#line 13922 "Photo.c" } } __finally320: { - PhotoRow* _tmp31_; + PhotoRow* _tmp28_; #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = self->row; + _tmp28_ = self->row; #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13264 "Photo.c" +#line 13932 "Photo.c" } #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -13278,7 +13946,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop _photo_reimport_raw_development_state_unref0 (reimport_state); #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13280 "Photo.c" +#line 13948 "Photo.c" } else { #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); @@ -13292,63 +13960,65 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop g_clear_error (&_inner_error_); #line 1661 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13294 "Photo.c" +#line 13962 "Photo.c" } } } } #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev); -#line 13301 "Photo.c" +#line 13969 "Photo.c" } #line 1657 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_dev_it); -#line 13305 "Photo.c" +#line 13973 "Photo.c" } #line 1675 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); + _tmp29_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time"); #line 1675 "/home/jens/Source/shotwell/src/Photo.vala" - list = _tmp32_; + list = _tmp29_; #line 1676 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = reimport_state; + _tmp30_ = reimport_state; #line 1676 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_->metadata_only; + _tmp31_ = _tmp30_->metadata_only; #line 1676 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp34_) { -#line 13317 "Photo.c" - const gchar* _tmp35_; - gchar* _tmp36_; + if (!_tmp31_) { +#line 13985 "Photo.c" + const gchar* _tmp32_; + gchar* _tmp33_; #line 1677 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = list; + _tmp32_ = list; #line 1677 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = g_strconcat (_tmp35_, "image:editable,image:baseline", NULL); + _tmp33_ = g_strconcat (_tmp32_, "image:editable,image:baseline", NULL); #line 1677 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); #line 1677 "/home/jens/Source/shotwell/src/Photo.vala" - list = _tmp36_; -#line 13328 "Photo.c" + list = _tmp33_; +#line 13996 "Photo.c" } #line 1679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = list; + _tmp34_ = list; #line 1679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = alteration_new_from_list (_tmp37_); + _tmp35_ = alteration_new_from_list (_tmp34_); #line 1679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tmp38_; + _tmp36_ = _tmp35_; #line 1679 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp36_); #line 1679 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp39_); + _alteration_unref0 (_tmp36_); #line 1681 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_raw_development_modified (self); #line 1651 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (list); #line 1651 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_raw_development_state_unref0 (reimport_state); -#line 13346 "Photo.c" +#line 14014 "Photo.c" } -static gchar* photo_real_get_typename (DataSource* base) { +static gchar* +photo_real_get_typename (DataSource* base) +{ Photo * self; gchar* result = NULL; gchar* _tmp0_; @@ -13360,11 +14030,13 @@ static gchar* photo_real_get_typename (DataSource* base) { result = _tmp0_; #line 1685 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13362 "Photo.c" +#line 14032 "Photo.c" } -static gint64 photo_real_get_instance_id (DataSource* base) { +static gint64 +photo_real_get_instance_id (DataSource* base) +{ Photo * self; gint64 result = 0LL; PhotoID _tmp0_ = {0}; @@ -13379,18 +14051,19 @@ static gint64 photo_real_get_instance_id (DataSource* base) { result = _tmp1_; #line 1689 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13381 "Photo.c" +#line 14053 "Photo.c" } -static gchar* photo_real_get_source_id (DataSource* base) { +static gchar* +photo_real_get_source_id (DataSource* base) +{ Photo * self; gchar* result = NULL; gchar* _tmp0_; gchar* _tmp1_; - gint64 _tmp2_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; #line 1692 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13398,134 +14071,131 @@ static gchar* photo_real_get_source_id (DataSource* base) { #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource)); + _tmp2_ = g_strdup_printf ("%s%016" G_GINT64_MODIFIER "x", _tmp1_, data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource))); #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = g_strdup_printf ("%s%016" G_GINT64_MODIFIER "x", _tmp1_, _tmp2_); -#line 1696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp1_); #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 1696 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13411 "Photo.c" +#line 14082 "Photo.c" } -void photo_set_master_timestamp (Photo* self, GFileInfo* info) { +void +photo_set_master_timestamp (Photo* self, + GFileInfo* info) +{ GTimeVal modification = {0}; - GFileInfo* _tmp0_; - GTimeVal _tmp1_ = {0}; - gboolean _tmp21_; + GTimeVal _tmp0_ = {0}; GError * _inner_error_ = NULL; #line 1700 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1700 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 1701 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = info; -#line 1701 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_info_get_modification_time (_tmp0_, &_tmp1_); + g_file_info_get_modification_time (info, &_tmp0_); #line 1701 "/home/jens/Source/shotwell/src/Photo.vala" - modification = _tmp1_; -#line 13431 "Photo.c" + modification = _tmp0_; +#line 14101 "Photo.c" { { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 13439 "Photo.c" +#line 14109 "Photo.c" { - PhotoRow* _tmp3_; - BackingPhotoRow* _tmp4_; - time_t _tmp5_; - GTimeVal _tmp6_; - glong _tmp7_; + PhotoRow* _tmp2_; + BackingPhotoRow* _tmp3_; + time_t _tmp4_; + GTimeVal _tmp5_; + glong _tmp6_; + PhotoTable* _tmp8_; PhotoTable* _tmp9_; - PhotoTable* _tmp10_; - PhotoRow* _tmp11_; - PhotoID _tmp12_; - GTimeVal _tmp13_; - glong _tmp14_; - PhotoRow* _tmp15_; - BackingPhotoRow* _tmp16_; - GTimeVal _tmp17_; - glong _tmp18_; + PhotoRow* _tmp10_; + PhotoID _tmp11_; + GTimeVal _tmp12_; + glong _tmp13_; + PhotoRow* _tmp14_; + BackingPhotoRow* _tmp15_; + GTimeVal _tmp16_; + glong _tmp17_; #line 1705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->row; + _tmp2_ = self->row; #line 1705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_->master; + _tmp3_ = _tmp2_->master; #line 1705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->timestamp; + _tmp4_ = _tmp3_->timestamp; #line 1705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = modification; + _tmp5_ = modification; #line 1705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_.tv_sec; + _tmp6_ = _tmp5_.tv_sec; #line 1705 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_ == ((time_t) _tmp7_)) { -#line 13468 "Photo.c" + if (_tmp4_ == ((time_t) _tmp6_)) { +#line 14138 "Photo.c" { - PhotoRow* _tmp8_; + PhotoRow* _tmp7_; #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->row; + _tmp7_ = self->row; #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13475 "Photo.c" +#line 14145 "Photo.c" } #line 1706 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13479 "Photo.c" +#line 14149 "Photo.c" } #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_table_get_instance (); + _tmp8_ = photo_table_get_instance (); #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + _tmp10_ = self->row; #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_->photo_id; + _tmp11_ = _tmp10_->photo_id; #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = modification; + _tmp12_ = modification; #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_.tv_sec; + _tmp13_ = _tmp12_.tv_sec; #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_update_timestamp (_tmp10_, &_tmp12_, (time_t) _tmp14_, &_inner_error_); + photo_table_update_timestamp (_tmp9_, &_tmp11_, (time_t) _tmp13_, &_inner_error_); #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp10_); + _database_table_unref0 (_tmp9_); #line 1708 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13499 "Photo.c" +#line 14169 "Photo.c" goto __finally322; } #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = self->row; + _tmp14_ = self->row; #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_->master; + _tmp15_ = _tmp14_->master; #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = modification; + _tmp16_ = modification; #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_.tv_sec; + _tmp17_ = _tmp16_.tv_sec; #line 1709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_->timestamp = (time_t) _tmp18_; -#line 13512 "Photo.c" + _tmp15_->timestamp = (time_t) _tmp17_; +#line 14182 "Photo.c" } __finally322: { - PhotoRow* _tmp19_; + PhotoRow* _tmp18_; #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp18_ = self->row; #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13521 "Photo.c" +#line 14191 "Photo.c" } #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 13527 "Photo.c" +#line 14197 "Photo.c" goto __catch321_database_error; } #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13534,7 +14204,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { g_clear_error (&_inner_error_); #line 1704 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13536 "Photo.c" +#line 14206 "Photo.c" } } } @@ -13542,20 +14212,20 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { __catch321_database_error: { GError* err = NULL; - GError* _tmp20_; + GError* _tmp19_; #line 1703 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1703 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1712 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = err; + _tmp19_ = err; #line 1712 "/home/jens/Source/shotwell/src/Photo.vala" - app_window_database_error (_tmp20_); + app_window_database_error (_tmp19_); #line 1714 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); #line 1714 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13557 "Photo.c" +#line 14227 "Photo.c" } __finally321: #line 1703 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13566,152 +14236,148 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) { g_clear_error (&_inner_error_); #line 1703 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13568 "Photo.c" +#line 14238 "Photo.c" } #line 1717 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_is_master_baseline (self); -#line 1717 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_) { -#line 13574 "Photo.c" - Alteration* _tmp22_; - Alteration* _tmp23_; + if (photo_is_master_baseline (self)) { +#line 14242 "Photo.c" + Alteration* _tmp20_; + Alteration* _tmp21_; #line 1718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = alteration_new_from_list ("metadata:master-timestamp,metadata:baseline-timestamp"); + _tmp20_ = alteration_new_from_list ("metadata:master-timestamp,metadata:baseline-timestamp"); #line 1718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 1718 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_); #line 1718 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp23_); -#line 13585 "Photo.c" + _alteration_unref0 (_tmp21_); +#line 14253 "Photo.c" } else { - Alteration* _tmp24_; - Alteration* _tmp25_; + Alteration* _tmp22_; + Alteration* _tmp23_; #line 1720 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = alteration_new ("metadata", "master-timestamp"); + _tmp22_ = alteration_new ("metadata", "master-timestamp"); #line 1720 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 1720 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_); #line 1720 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp25_); -#line 13597 "Photo.c" + _alteration_unref0 (_tmp23_); +#line 14265 "Photo.c" } } -void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GError** error) { +void +photo_update_editable_modification_time (Photo* self, + GFileInfo* info, + GError** error) +{ GTimeVal modification = {0}; - GFileInfo* _tmp0_; - GTimeVal _tmp1_ = {0}; + GTimeVal _tmp0_ = {0}; gboolean altered = FALSE; - gboolean _tmp20_; + gboolean _tmp18_; GError * _inner_error_ = NULL; #line 1724 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1724 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 1725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = info; -#line 1725 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_info_get_modification_time (_tmp0_, &_tmp1_); + g_file_info_get_modification_time (info, &_tmp0_); #line 1725 "/home/jens/Source/shotwell/src/Photo.vala" - modification = _tmp1_; + modification = _tmp0_; #line 1727 "/home/jens/Source/shotwell/src/Photo.vala" altered = FALSE; -#line 13621 "Photo.c" +#line 14290 "Photo.c" { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 13628 "Photo.c" +#line 14297 "Photo.c" { - gboolean _tmp3_ = FALSE; - PhotoRow* _tmp4_; - gboolean _tmp5_; -#line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + gboolean _tmp2_ = FALSE; + PhotoRow* _tmp3_; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = backing_photo_id_is_valid (&_tmp4_->editable_id); + _tmp3_ = self->row; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 13639 "Photo.c" - BackingPhotoRow* _tmp6_; - time_t _tmp7_; - GTimeVal _tmp8_; - glong _tmp9_; + if (backing_photo_id_is_valid (&_tmp3_->editable_id)) { +#line 14305 "Photo.c" + BackingPhotoRow* _tmp4_; + time_t _tmp5_; + GTimeVal _tmp6_; + glong _tmp7_; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->priv->editable; + _tmp4_ = self->priv->editable; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_->timestamp; + _tmp5_ = _tmp4_->timestamp; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = modification; + _tmp6_ = modification; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_.tv_sec; + _tmp7_ = _tmp6_.tv_sec; #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp7_ != ((time_t) _tmp9_); -#line 13654 "Photo.c" + _tmp2_ = _tmp5_ != ((time_t) _tmp7_); +#line 14320 "Photo.c" } else { #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = FALSE; -#line 13658 "Photo.c" + _tmp2_ = FALSE; +#line 14324 "Photo.c" } #line 1729 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp3_) { -#line 13662 "Photo.c" - BackingPhotoTable* _tmp10_; - BackingPhotoTable* _tmp11_; - PhotoRow* _tmp12_; - BackingPhotoID _tmp13_; - GTimeVal _tmp14_; - glong _tmp15_; - BackingPhotoRow* _tmp16_; - GTimeVal _tmp17_; - glong _tmp18_; + if (_tmp2_) { +#line 14328 "Photo.c" + BackingPhotoTable* _tmp8_; + BackingPhotoTable* _tmp9_; + PhotoRow* _tmp10_; + BackingPhotoID _tmp11_; + GTimeVal _tmp12_; + glong _tmp13_; + BackingPhotoRow* _tmp14_; + GTimeVal _tmp15_; + glong _tmp16_; #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = backing_photo_table_get_instance (); + _tmp8_ = backing_photo_table_get_instance (); #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = self->row; + _tmp10_ = self->row; #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_->editable_id; + _tmp11_ = _tmp10_->editable_id; #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = modification; + _tmp12_ = modification; #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_.tv_sec; + _tmp13_ = _tmp12_.tv_sec; #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_update_timestamp (_tmp11_, &_tmp13_, (time_t) _tmp15_, &_inner_error_); + backing_photo_table_update_timestamp (_tmp9_, &_tmp11_, (time_t) _tmp13_, &_inner_error_); #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp11_); + _database_table_unref0 (_tmp9_); #line 1730 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13690 "Photo.c" +#line 14356 "Photo.c" goto __finally323; } #line 1732 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->priv->editable; + _tmp14_ = self->priv->editable; #line 1732 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = modification; + _tmp15_ = modification; #line 1732 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_.tv_sec; + _tmp16_ = _tmp15_.tv_sec; #line 1732 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_->timestamp = (time_t) _tmp18_; + _tmp14_->timestamp = (time_t) _tmp16_; #line 1733 "/home/jens/Source/shotwell/src/Photo.vala" altered = TRUE; -#line 13703 "Photo.c" +#line 14369 "Photo.c" } } __finally323: { - PhotoRow* _tmp19_; + PhotoRow* _tmp17_; #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp17_ = self->row; #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 13713 "Photo.c" +#line 14379 "Photo.c" } #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -13721,7 +14387,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr g_propagate_error (error, _inner_error_); #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13723 "Photo.c" +#line 14389 "Photo.c" } else { #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); @@ -13729,104 +14395,98 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr g_clear_error (&_inner_error_); #line 1728 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13731 "Photo.c" +#line 14397 "Photo.c" } } } #line 1737 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = altered; + _tmp18_ = altered; #line 1737 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp20_) { -#line 13739 "Photo.c" - Alteration* _tmp21_; - Alteration* _tmp22_; + if (_tmp18_) { +#line 14405 "Photo.c" + Alteration* _tmp19_; + Alteration* _tmp20_; #line 1738 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = alteration_new_from_list ("metadata:editable-timestamp,metadata:baseline-timestamp"); + _tmp19_ = alteration_new_from_list ("metadata:editable-timestamp,metadata:baseline-timestamp"); #line 1738 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 1738 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp22_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_); #line 1738 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp22_); -#line 13750 "Photo.c" + _alteration_unref0 (_tmp20_); +#line 14416 "Photo.c" } } -void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { +void +photo_update_many_editable_timestamps (GeeMap* map, + GError** error) +{ GError * _inner_error_ = NULL; #line 1742 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 1744 "/home/jens/Source/shotwell/src/Photo.vala" database_table_begin_transaction (); -#line 13761 "Photo.c" +#line 14430 "Photo.c" { GeeIterator* _photo_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = map; + _tmp0_ = gee_map_get_keys (map); #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = _tmp3_; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _g_object_unref0 (_tmp2_); #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); -#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_it = _tmp5_; + _photo_it = _tmp4_; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 13788 "Photo.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 14454 "Photo.c" + GeeIterator* _tmp5_; Photo* photo = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - Photo* _tmp10_; - GeeMap* _tmp11_; - Photo* _tmp12_; - gpointer _tmp13_; - GFileInfo* _tmp14_; -#line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _photo_it; + GeeIterator* _tmp6_; + gpointer _tmp7_; + Photo* _tmp8_; + Photo* _tmp9_; + gpointer _tmp10_; + GFileInfo* _tmp11_; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _photo_it; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 13807 "Photo.c" +#line 14469 "Photo.c" } #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _photo_it; + _tmp6_ = _photo_it; #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" - photo = (Photo*) _tmp9_; -#line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo; + photo = (Photo*) _tmp7_; #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = map; + _tmp8_ = photo; #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo; + _tmp9_ = photo; #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = gee_map_get (_tmp11_, _tmp12_); + _tmp10_ = gee_map_get (map, _tmp9_); #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = (GFileInfo*) _tmp13_; + _tmp11_ = (GFileInfo*) _tmp10_; #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - photo_update_editable_modification_time (_tmp10_, _tmp14_, &_inner_error_); + photo_update_editable_modification_time (_tmp8_, _tmp11_, &_inner_error_); #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp11_); #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" @@ -13839,7 +14499,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { _g_object_unref0 (_photo_it); #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13841 "Photo.c" +#line 14501 "Photo.c" } else { #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); @@ -13851,16 +14511,16 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { g_clear_error (&_inner_error_); #line 1746 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13853 "Photo.c" +#line 14513 "Photo.c" } } #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 13858 "Photo.c" +#line 14518 "Photo.c" } #line 1745 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 13862 "Photo.c" +#line 14522 "Photo.c" } #line 1747 "/home/jens/Source/shotwell/src/Photo.vala" database_table_commit_transaction (&_inner_error_); @@ -13872,7 +14532,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { g_propagate_error (error, _inner_error_); #line 1747 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13874 "Photo.c" +#line 14534 "Photo.c" } else { #line 1747 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -13880,163 +14540,142 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) { g_clear_error (&_inner_error_); #line 1747 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 13882 "Photo.c" +#line 14542 "Photo.c" } } } -static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSource* base) { +static PhotoFileFormat +photo_real_get_preferred_thumbnail_format (ThumbnailSource* base) +{ Photo * self; PhotoFileFormat result = 0; PhotoFileFormat _tmp0_ = 0; - PhotoFileFormat _tmp1_; - gboolean _tmp2_; #line 1750 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 1751 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_file_format (self); -#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_format_can_write_image (_tmp1_); -#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { -#line 13902 "Photo.c" - PhotoFileFormat _tmp3_; -#line 1751 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_file_format (self); + if (photo_file_format_can_write_image (photo_get_file_format (self))) { #line 1751 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_; -#line 13908 "Photo.c" + _tmp0_ = photo_get_file_format (self); +#line 14560 "Photo.c" } else { - PhotoFileFormat _tmp4_; -#line 1752 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_file_format_get_system_default_format (); #line 1752 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp4_; -#line 13915 "Photo.c" + _tmp0_ = photo_file_format_get_system_default_format (); +#line 14564 "Photo.c" } #line 1751 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 1751 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13921 "Photo.c" +#line 14570 "Photo.c" } -static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +photo_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ Photo * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - gint _tmp1_; - Scaling _tmp2_ = {0}; + Scaling _tmp1_ = {0}; + GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; GError * _inner_error_ = NULL; #line 1755 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = scale; -#line 1756 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_for_best_fit (_tmp1_, TRUE, &_tmp2_); + scaling_for_best_fit (scale, TRUE, &_tmp1_); #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp2_, &_inner_error_); + _tmp2_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp1_, &_inner_error_); #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_; + _tmp0_ = _tmp2_; #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 13950 "Photo.c" +#line 14600 "Photo.c" } #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp0_; + _tmp3_ = _tmp0_; #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); #line 1756 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 13962 "Photo.c" +#line 14612 "Photo.c" } -gboolean photo_is_file_image (GFile* file) { +gboolean +photo_is_file_image (GFile* file) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; - GFile* _tmp1_; - gboolean _tmp2_; #line 1759 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 1763 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file; -#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_format_is_file_supported (_tmp1_); -#line 1763 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { + if (photo_file_format_is_file_supported (file)) { #line 1764 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 13981 "Photo.c" +#line 14627 "Photo.c" } else { - GFile* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - gboolean _tmp6_; -#line 1764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = file; -#line 1764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = g_file_get_basename (_tmp3_); + gchar* _tmp1_; + gchar* _tmp2_; #line 1764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp1_ = g_file_get_basename (file); #line 1764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_is_extension_found (_tmp5_, PHOTO_IMAGE_EXTENSIONS, G_N_ELEMENTS (PHOTO_IMAGE_EXTENSIONS)); + _tmp2_ = _tmp1_; #line 1764 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp6_; + _tmp0_ = photo_is_extension_found (_tmp2_, PHOTO_IMAGE_EXTENSIONS, G_N_ELEMENTS (PHOTO_IMAGE_EXTENSIONS)); #line 1764 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp5_); -#line 13999 "Photo.c" + _g_free0 (_tmp2_); +#line 14639 "Photo.c" } #line 1763 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 1763 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14005 "Photo.c" +#line 14645 "Photo.c" } -static gboolean photo_is_extension_found (const gchar* basename, gchar** extensions, int extensions_length1) { +static gboolean +photo_is_extension_found (const gchar* basename, + gchar** extensions, + int extensions_length1) +{ gboolean result = FALSE; gchar* name = NULL; gchar* ext = NULL; - const gchar* _tmp0_; + gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - gchar** _tmp6_; - gint _tmp6__length1; + gchar* _tmp4_; #line 1767 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (basename != NULL, FALSE); #line 1769 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = basename; -#line 1769 "/home/jens/Source/shotwell/src/Photo.vala" - disassemble_filename (_tmp0_, &_tmp1_, &_tmp2_); + disassemble_filename (basename, &_tmp0_, &_tmp1_); #line 1769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); #line 1769 "/home/jens/Source/shotwell/src/Photo.vala" - name = _tmp1_; + name = _tmp0_; #line 1769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); #line 1769 "/home/jens/Source/shotwell/src/Photo.vala" - ext = _tmp2_; + ext = _tmp1_; #line 1770 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = ext; + _tmp2_ = ext; #line 1770 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 1771 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 1771 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14045,49 +14684,45 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi _g_free0 (name); #line 1771 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14047 "Photo.c" +#line 14686 "Photo.c" } #line 1774 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = ext; + _tmp3_ = ext; #line 1774 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = g_utf8_strdown (_tmp4_, (gssize) -1); + _tmp4_ = g_utf8_strdown (_tmp3_, (gssize) -1); #line 1774 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); #line 1774 "/home/jens/Source/shotwell/src/Photo.vala" - ext = _tmp5_; -#line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = extensions; -#line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6__length1 = extensions_length1; -#line 14061 "Photo.c" + ext = _tmp4_; +#line 14696 "Photo.c" { gchar** extension_collection = NULL; gint extension_collection_length1 = 0; gint _extension_collection_size_ = 0; gint extension_it = 0; #line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - extension_collection = _tmp6_; + extension_collection = extensions; #line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - extension_collection_length1 = _tmp6__length1; + extension_collection_length1 = extensions_length1; #line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - for (extension_it = 0; extension_it < _tmp6__length1; extension_it = extension_it + 1) { -#line 14073 "Photo.c" - gchar* _tmp7_; + for (extension_it = 0; extension_it < extensions_length1; extension_it = extension_it + 1) { +#line 14708 "Photo.c" + gchar* _tmp5_; gchar* extension = NULL; #line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = g_strdup (extension_collection[extension_it]); + _tmp5_ = g_strdup (extension_collection[extension_it]); #line 1777 "/home/jens/Source/shotwell/src/Photo.vala" - extension = _tmp7_; -#line 14080 "Photo.c" + extension = _tmp5_; +#line 14715 "Photo.c" { - const gchar* _tmp8_; - const gchar* _tmp9_; + const gchar* _tmp6_; + const gchar* _tmp7_; #line 1778 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = ext; + _tmp6_ = ext; #line 1778 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = extension; + _tmp7_ = extension; #line 1778 "/home/jens/Source/shotwell/src/Photo.vala" - if (g_strcmp0 (_tmp8_, _tmp9_) == 0) { + if (g_strcmp0 (_tmp6_, _tmp7_) == 0) { #line 1779 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 1779 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14098,11 +14733,11 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi _g_free0 (name); #line 1779 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14100 "Photo.c" +#line 14735 "Photo.c" } #line 1777 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (extension); -#line 14104 "Photo.c" +#line 14739 "Photo.c" } } } @@ -14114,20 +14749,20 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi _g_free0 (name); #line 1782 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14116 "Photo.c" +#line 14751 "Photo.c" } -gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format) { +gboolean +photo_is_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format) +{ gboolean result = FALSE; PhotoTable* _tmp0_; PhotoTable* _tmp1_; - GFile* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - PhotoFileFormat _tmp5_; - gboolean _tmp6_; - gboolean _tmp7_; + gboolean _tmp2_; #line 1788 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); #line 1791 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14135,41 +14770,33 @@ gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gcha #line 1791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = file; -#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = thumbnail_md5; -#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = full_md5; -#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = file_format; -#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_table_has_duplicate (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); -#line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp2_ = photo_table_has_duplicate (_tmp1_, file, thumbnail_md5, full_md5, file_format); #line 1791 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); #line 1791 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp7_; + result = _tmp2_; #line 1791 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14154 "Photo.c" +#line 14779 "Photo.c" } -PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, int* result_length1) { +PhotoID* +photo_get_duplicate_ids (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format, + int* result_length1) +{ PhotoID* result = NULL; PhotoTable* _tmp0_; PhotoTable* _tmp1_; - GFile* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - PhotoFileFormat _tmp5_; - gint _tmp6_; - PhotoID* _tmp7_; - PhotoID* _tmp8_; - gint _tmp8__length1; - PhotoID* _tmp9_; - gint _tmp9__length1; + gint _tmp2_; + PhotoID* _tmp3_; + PhotoID* _tmp4_; + gint _tmp4__length1; + PhotoID* _tmp5_; + gint _tmp5__length1; #line 1797 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14177,61 +14804,54 @@ PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = file; -#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = thumbnail_md5; -#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = full_md5; -#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = file_format; + _tmp3_ = photo_table_get_duplicate_ids (_tmp1_, file, thumbnail_md5, full_md5, file_format, &_tmp2_); #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_table_get_duplicate_ids (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_); -#line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8__length1 = _tmp6_; + _tmp4__length1 = _tmp2_; #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp5_ = _tmp4_; #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9__length1 = _tmp8__length1; + _tmp5__length1 = _tmp4__length1; #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - *result_length1 = _tmp9__length1; -#line 14202 "Photo.c" + *result_length1 = _tmp5__length1; +#line 14821 "Photo.c" } #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp9_; + result = _tmp5_; #line 1800 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14208 "Photo.c" +#line 14827 "Photo.c" } -gint64 photo_get_photo_key (DataSource* source) { +gint64 +photo_get_photo_key (DataSource* source) +{ gint64 result = 0LL; - DataSource* _tmp0_; - PhotoID _tmp1_ = {0}; - gint64 _tmp2_; + PhotoID _tmp0_ = {0}; + gint64 _tmp1_; #line 1807 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL); #line 1808 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = source; + photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_PHOTO, Photo), &_tmp0_); #line 1808 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_PHOTO, Photo), &_tmp1_); -#line 1808 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _tmp1_.id; + _tmp1_ = _tmp0_.id; #line 1808 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp2_; + result = _tmp1_; #line 1808 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14229 "Photo.c" +#line 14847 "Photo.c" } -static GFile* photo_real_get_file (MediaSource* base) { +static GFile* +photo_real_get_file (MediaSource* base) +{ Photo * self; GFile* result = NULL; PhotoFileReader* _tmp0_; @@ -14254,99 +14874,119 @@ static GFile* photo_real_get_file (MediaSource* base) { result = _tmp3_; #line 1827 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 14256 "Photo.c" +#line 14876 "Photo.c" } -static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add100 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14267 "Photo.c" +#line 14892 "Photo.c" } #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14273 "Photo.c" +#line 14898 "Photo.c" } -static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add101 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14284 "Photo.c" +#line 14914 "Photo.c" } #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14290 "Photo.c" +#line 14920 "Photo.c" } -static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add102 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14301 "Photo.c" +#line 14936 "Photo.c" } #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14307 "Photo.c" +#line 14942 "Photo.c" } -static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add103 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14318 "Photo.c" +#line 14958 "Photo.c" } #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14324 "Photo.c" +#line 14964 "Photo.c" } -void photo_set_master_file (Photo* self, GFile* file) { +void +photo_set_master_file (Photo* self, + GFile* file) +{ gchar* filepath = NULL; - GFile* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gboolean altered = FALSE; gboolean is_baseline = FALSE; gboolean is_source = FALSE; gboolean name_changed = FALSE; GFile* old_file = NULL; - gboolean _tmp41_; + gboolean _tmp33_; GError * _inner_error_ = NULL; #line 1832 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1832 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); #line 1833 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 1833 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (file); #line 1833 "/home/jens/Source/shotwell/src/Photo.vala" - filepath = _tmp1_; + filepath = _tmp0_; #line 1835 "/home/jens/Source/shotwell/src/Photo.vala" altered = FALSE; #line 1836 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14357,208 +14997,187 @@ void photo_set_master_file (Photo* self, GFile* file) { name_changed = FALSE; #line 1839 "/home/jens/Source/shotwell/src/Photo.vala" old_file = NULL; -#line 14359 "Photo.c" +#line 14999 "Photo.c" { { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 14367 "Photo.c" +#line 15007 "Photo.c" { { - PhotoBackingReaders* _tmp3_; + PhotoBackingReaders* _tmp2_; #line 1842 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->readers; + _tmp2_ = self->priv->readers; #line 1842 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 14375 "Photo.c" +#line 15015 "Photo.c" { - PhotoBackingReaders* _tmp4_; - PhotoFileReader* _tmp5_; + PhotoBackingReaders* _tmp3_; + PhotoFileReader* _tmp4_; + GFile* _tmp5_; GFile* _tmp6_; - GFile* _tmp7_; - GFile* _tmp8_; - gboolean _tmp9_; #line 1843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->readers; + _tmp3_ = self->priv->readers; #line 1843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->master; + _tmp4_ = _tmp3_->master; #line 1843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp5_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 1843 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); #line 1843 "/home/jens/Source/shotwell/src/Photo.vala" - old_file = _tmp6_; + old_file = _tmp5_; #line 1844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = file; + _tmp6_ = old_file; #line 1844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = old_file; -#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = g_file_equal (_tmp7_, _tmp8_); -#line 1844 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp9_) { -#line 14401 "Photo.c" - PhotoTable* _tmp10_; - PhotoTable* _tmp11_; - PhotoID _tmp12_ = {0}; + if (!g_file_equal (file, _tmp6_)) { +#line 15035 "Photo.c" + PhotoTable* _tmp7_; + PhotoTable* _tmp8_; + PhotoID _tmp9_ = {0}; + const gchar* _tmp10_; + PhotoRow* _tmp11_; + BackingPhotoRow* _tmp12_; const gchar* _tmp13_; - PhotoRow* _tmp14_; - BackingPhotoRow* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; - GFile* _tmp18_; - gchar* _tmp19_; - PhotoBackingReaders* _tmp20_; - PhotoRow* _tmp21_; - BackingPhotoRow* _tmp22_; - PhotoFileFormat _tmp23_; + gchar* _tmp14_; + gchar* _tmp15_; + PhotoBackingReaders* _tmp16_; + PhotoRow* _tmp17_; + BackingPhotoRow* _tmp18_; + PhotoFileFormat _tmp19_; + const gchar* _tmp20_; + PhotoFileReader* _tmp21_; + gboolean _tmp22_ = FALSE; + PhotoRow* _tmp23_; const gchar* _tmp24_; - PhotoFileReader* _tmp25_; - gboolean _tmp26_; - gboolean _tmp27_; - gboolean _tmp28_ = FALSE; - PhotoRow* _tmp29_; - const gchar* _tmp30_; - gboolean _tmp31_; #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_table_get_instance (); + _tmp7_ = photo_table_get_instance (); #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp12_); + photo_get_photo_id (self, &_tmp9_); #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = filepath; + _tmp10_ = filepath; #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_set_filepath (_tmp11_, &_tmp12_, _tmp13_, &_inner_error_); + photo_table_set_filepath (_tmp8_, &_tmp9_, _tmp10_, &_inner_error_); #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp11_); + _database_table_unref0 (_tmp8_); #line 1845 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14438 "Photo.c" +#line 15068 "Photo.c" goto __finally326; } #line 1847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp11_ = self->row; #line 1847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->master; + _tmp12_ = _tmp11_->master; #line 1847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = filepath; + _tmp13_ = filepath; #line 1847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp14_ = g_strdup (_tmp13_); #line 1847 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp15_->filepath); + _g_free0 (_tmp12_->filepath); #line 1847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_->filepath = _tmp17_; -#line 1848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = file; + _tmp12_->filepath = _tmp14_; #line 1848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = g_file_get_basename (_tmp18_); + _tmp15_ = g_file_get_basename (file); #line 1848 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (self->priv->file_title); #line 1848 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->file_title = _tmp19_; + self->priv->file_title = _tmp15_; #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->priv->readers; + _tmp16_ = self->priv->readers; #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = self->row; + _tmp17_ = self->row; #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->master; + _tmp18_ = _tmp17_->master; #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_->file_format; + _tmp19_ = _tmp18_->file_format; #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = filepath; + _tmp20_ = filepath; #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = photo_file_format_create_reader (_tmp23_, _tmp24_); + _tmp21_ = photo_file_format_create_reader (_tmp19_, _tmp20_); #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp20_->master); + _photo_file_adapter_unref0 (_tmp16_->master); #line 1849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_->master = _tmp25_; + _tmp16_->master = _tmp21_; #line 1851 "/home/jens/Source/shotwell/src/Photo.vala" altered = TRUE; #line 1852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_is_master_baseline (self); -#line 1852 "/home/jens/Source/shotwell/src/Photo.vala" - is_baseline = _tmp26_; + is_baseline = photo_is_master_baseline (self); #line 1853 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = photo_is_master_source (self); -#line 1853 "/home/jens/Source/shotwell/src/Photo.vala" - is_source = _tmp27_; -#line 1854 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = self->row; + is_source = photo_is_master_source (self); #line 1854 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_->title; + _tmp23_ = self->row; #line 1854 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = is_string_empty (_tmp30_); + _tmp24_ = _tmp23_->title; #line 1854 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp31_) { -#line 14495 "Photo.c" - GFile* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; - GFile* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; -#line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = old_file; + if (is_string_empty (_tmp24_)) { +#line 15117 "Photo.c" + GFile* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = g_file_get_basename (_tmp32_); + _tmp25_ = old_file; #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_; + _tmp26_ = g_file_get_basename (_tmp25_); #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = file; + _tmp27_ = _tmp26_; #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = g_file_get_basename (_tmp35_); + _tmp28_ = g_file_get_basename (file); #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_; + _tmp29_ = _tmp28_; #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = g_strcmp0 (_tmp34_, _tmp37_) != 0; + _tmp22_ = g_strcmp0 (_tmp27_, _tmp29_) != 0; #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp29_); #line 1855 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp34_); -#line 14520 "Photo.c" + _g_free0 (_tmp27_); +#line 15139 "Photo.c" } else { #line 1854 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = FALSE; -#line 14524 "Photo.c" + _tmp22_ = FALSE; +#line 15143 "Photo.c" } #line 1854 "/home/jens/Source/shotwell/src/Photo.vala" - name_changed = _tmp28_; -#line 14528 "Photo.c" + name_changed = _tmp22_; +#line 15147 "Photo.c" } } __finally326: { - PhotoBackingReaders* _tmp38_; + PhotoBackingReaders* _tmp30_; #line 1842 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = self->priv->readers; + _tmp30_ = self->priv->readers; #line 1842 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 14538 "Photo.c" +#line 15157 "Photo.c" } #line 1842 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14542 "Photo.c" +#line 15161 "Photo.c" goto __finally325; } } } __finally325: { - PhotoRow* _tmp39_; + PhotoRow* _tmp31_; #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = self->row; + _tmp31_ = self->row; #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 14554 "Photo.c" +#line 15173 "Photo.c" } #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 14560 "Photo.c" +#line 15179 "Photo.c" goto __catch324_database_error; } #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14571,7 +15190,7 @@ void photo_set_master_file (Photo* self, GFile* file) { g_clear_error (&_inner_error_); #line 1841 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14573 "Photo.c" +#line 15192 "Photo.c" } } } @@ -14579,18 +15198,18 @@ void photo_set_master_file (Photo* self, GFile* file) { __catch324_database_error: { GError* err = NULL; - GError* _tmp40_; + GError* _tmp32_; #line 1840 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1840 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1860 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = err; + _tmp32_ = err; #line 1860 "/home/jens/Source/shotwell/src/Photo.vala" - app_window_database_error (_tmp40_); + app_window_database_error (_tmp32_); #line 1840 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 14592 "Photo.c" +#line 15211 "Photo.c" } __finally324: #line 1840 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14605,209 +15224,221 @@ void photo_set_master_file (Photo* self, GFile* file) { g_clear_error (&_inner_error_); #line 1840 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 14607 "Photo.c" +#line 15226 "Photo.c" } #line 1863 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = altered; + _tmp33_ = altered; #line 1863 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp41_) { -#line 14613 "Photo.c" - GFile* _tmp42_; - GFile* _tmp43_; - gboolean _tmp44_; + if (_tmp33_) { +#line 15232 "Photo.c" + GFile* _tmp34_; + gboolean _tmp35_; gchar** alteration_list = NULL; - gchar** _tmp45_; + gchar** _tmp36_; gint alteration_list_length1; gint _alteration_list_size_; - gchar** _tmp46_; - gint _tmp46__length1; - gchar* _tmp47_; - gboolean _tmp48_; - gboolean _tmp51_; - gboolean _tmp54_; - gchar** _tmp57_; - gint _tmp57__length1; - Alteration* _tmp58_; - Alteration* _tmp59_; -#line 1864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = old_file; + gchar** _tmp37_; + gint _tmp37__length1; + gchar* _tmp38_; + gboolean _tmp39_; + gboolean _tmp42_; + gboolean _tmp45_; + gchar** _tmp48_; + gint _tmp48__length1; + Alteration* _tmp49_; + Alteration* _tmp50_; #line 1864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = file; + _tmp34_ = old_file; #line 1864 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp42_, _tmp43_); + media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp34_, file); #line 1866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = is_baseline; + _tmp35_ = is_baseline; #line 1866 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_) { + if (_tmp35_) { #line 1867 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 14643 "Photo.c" +#line 15259 "Photo.c" } #line 1869 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = g_new0 (gchar*, 0 + 1); + _tmp36_ = g_new0 (gchar*, 0 + 1); #line 1869 "/home/jens/Source/shotwell/src/Photo.vala" - alteration_list = _tmp45_; + alteration_list = _tmp36_; #line 1869 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list_length1 = 0; #line 1869 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_list_size_ = alteration_list_length1; #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = alteration_list; + _tmp37_ = alteration_list; #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46__length1 = alteration_list_length1; + _tmp37__length1 = alteration_list_length1; #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = g_strdup ("backing:master"); + _tmp38_ = g_strdup ("backing:master"); #line 1870 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_); + _vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp38_); #line 1874 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = name_changed; + _tmp39_ = name_changed; #line 1874 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp48_) { -#line 14665 "Photo.c" - gchar** _tmp49_; - gint _tmp49__length1; - gchar* _tmp50_; + if (_tmp39_) { +#line 15281 "Photo.c" + gchar** _tmp40_; + gint _tmp40__length1; + gchar* _tmp41_; #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = alteration_list; + _tmp40_ = alteration_list; #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49__length1 = alteration_list_length1; + _tmp40__length1 = alteration_list_length1; #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = g_strdup ("metadata:name"); + _tmp41_ = g_strdup ("metadata:name"); #line 1875 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_); -#line 14677 "Photo.c" + _vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp41_); +#line 15293 "Photo.c" } #line 1877 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = is_source; + _tmp42_ = is_source; #line 1877 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp51_) { -#line 14683 "Photo.c" - gchar** _tmp52_; - gint _tmp52__length1; - gchar* _tmp53_; + if (_tmp42_) { +#line 15299 "Photo.c" + gchar** _tmp43_; + gint _tmp43__length1; + gchar* _tmp44_; #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = alteration_list; + _tmp43_ = alteration_list; #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52__length1 = alteration_list_length1; + _tmp43__length1 = alteration_list_length1; #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = g_strdup ("backing:source"); + _tmp44_ = g_strdup ("backing:source"); #line 1878 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_); -#line 14695 "Photo.c" + _vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp44_); +#line 15311 "Photo.c" } #line 1880 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = is_baseline; + _tmp45_ = is_baseline; #line 1880 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp54_) { -#line 14701 "Photo.c" - gchar** _tmp55_; - gint _tmp55__length1; - gchar* _tmp56_; + if (_tmp45_) { +#line 15317 "Photo.c" + gchar** _tmp46_; + gint _tmp46__length1; + gchar* _tmp47_; #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = alteration_list; + _tmp46_ = alteration_list; #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55__length1 = alteration_list_length1; + _tmp46__length1 = alteration_list_length1; #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = g_strdup ("backing:baseline"); + _tmp47_ = g_strdup ("backing:baseline"); #line 1881 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_); -#line 14713 "Photo.c" + _vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_); +#line 15329 "Photo.c" } #line 1883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = alteration_list; + _tmp48_ = alteration_list; #line 1883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57__length1 = alteration_list_length1; + _tmp48__length1 = alteration_list_length1; #line 1883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = alteration_new_from_array (_tmp57_, _tmp57__length1); + _tmp49_ = alteration_new_from_array (_tmp48_, _tmp48__length1); #line 1883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = _tmp58_; + _tmp50_ = _tmp49_; #line 1883 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp59_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp50_); #line 1883 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp59_); + _alteration_unref0 (_tmp50_); #line 1863 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); -#line 14729 "Photo.c" +#line 15345 "Photo.c" } #line 1832 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); #line 1832 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 14735 "Photo.c" +#line 15351 "Photo.c" } -static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add104 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14746 "Photo.c" +#line 15367 "Photo.c" } #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14752 "Photo.c" +#line 15373 "Photo.c" } -static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add105 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14763 "Photo.c" +#line 15389 "Photo.c" } #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14769 "Photo.c" +#line 15395 "Photo.c" } -static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add106 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 14780 "Photo.c" +#line 15411 "Photo.c" } #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 14786 "Photo.c" +#line 15417 "Photo.c" } -void photo_set_editable_file (Photo* self, GFile* file) { +void +photo_set_editable_file (Photo* self, + GFile* file) +{ gchar* filepath = NULL; - GFile* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gboolean altered = FALSE; gboolean is_baseline = FALSE; gboolean is_source = FALSE; GFile* old_file = NULL; - gboolean _tmp34_; + gboolean _tmp29_; GError * _inner_error_ = NULL; #line 1889 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 1889 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_IS_FILE (file)); #line 1890 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 1890 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = g_file_get_path (_tmp0_); + _tmp0_ = g_file_get_path (file); #line 1890 "/home/jens/Source/shotwell/src/Photo.vala" - filepath = _tmp1_; + filepath = _tmp0_; #line 1892 "/home/jens/Source/shotwell/src/Photo.vala" altered = FALSE; #line 1893 "/home/jens/Source/shotwell/src/Photo.vala" @@ -14816,195 +15447,183 @@ void photo_set_editable_file (Photo* self, GFile* file) { is_source = FALSE; #line 1895 "/home/jens/Source/shotwell/src/Photo.vala" old_file = NULL; -#line 14818 "Photo.c" +#line 15449 "Photo.c" { { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 14826 "Photo.c" +#line 15457 "Photo.c" { { - PhotoBackingReaders* _tmp3_; + PhotoBackingReaders* _tmp2_; #line 1898 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->readers; + _tmp2_ = self->priv->readers; #line 1898 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 14834 "Photo.c" +#line 15465 "Photo.c" { - GFile* _tmp4_ = NULL; - PhotoBackingReaders* _tmp5_; - PhotoFileReader* _tmp6_; - GFile* _tmp10_; - gboolean _tmp11_ = FALSE; - GFile* _tmp12_; + GFile* _tmp3_ = NULL; + PhotoBackingReaders* _tmp4_; + PhotoFileReader* _tmp5_; + GFile* _tmp9_; + gboolean _tmp10_ = FALSE; + GFile* _tmp11_; #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->priv->readers; + _tmp4_ = self->priv->readers; #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_->editable; + _tmp5_ = _tmp4_->editable; #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_ != NULL) { -#line 14848 "Photo.c" - PhotoBackingReaders* _tmp7_; - PhotoFileReader* _tmp8_; - GFile* _tmp9_; + if (_tmp5_ != NULL) { +#line 15479 "Photo.c" + PhotoBackingReaders* _tmp6_; + PhotoFileReader* _tmp7_; + GFile* _tmp8_; #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->priv->readers; + _tmp6_ = self->priv->readers; #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->editable; + _tmp7_ = _tmp6_->editable; #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp8_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp9_; -#line 14862 "Photo.c" + _tmp3_ = _tmp8_; +#line 15493 "Photo.c" } else { #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = NULL; -#line 14868 "Photo.c" + _tmp3_ = NULL; +#line 15499 "Photo.c" } #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _g_object_ref0 (_tmp4_); + _tmp9_ = _g_object_ref0 (_tmp3_); #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); #line 1899 "/home/jens/Source/shotwell/src/Photo.vala" - old_file = _tmp10_; -#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = old_file; -#line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_ != NULL) { -#line 14880 "Photo.c" - GFile* _tmp13_; - GFile* _tmp14_; - gboolean _tmp15_; + old_file = _tmp9_; #line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = old_file; + _tmp11_ = old_file; #line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = file; + if (_tmp11_ != NULL) { +#line 15511 "Photo.c" + GFile* _tmp12_; #line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = g_file_equal (_tmp13_, _tmp14_); + _tmp12_ = old_file; #line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = !_tmp15_; -#line 14892 "Photo.c" + _tmp10_ = !g_file_equal (_tmp12_, file); +#line 15517 "Photo.c" } else { #line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = FALSE; -#line 14896 "Photo.c" + _tmp10_ = FALSE; +#line 15521 "Photo.c" } #line 1900 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 14900 "Photo.c" - BackingPhotoTable* _tmp16_; - BackingPhotoTable* _tmp17_; - PhotoRow* _tmp18_; - BackingPhotoID _tmp19_; - const gchar* _tmp20_; - BackingPhotoRow* _tmp21_; - const gchar* _tmp22_; - gchar* _tmp23_; - PhotoBackingReaders* _tmp24_; - BackingPhotoRow* _tmp25_; - PhotoFileFormat _tmp26_; - const gchar* _tmp27_; - PhotoFileReader* _tmp28_; - gboolean _tmp29_; - gboolean _tmp30_; + if (_tmp10_) { +#line 15525 "Photo.c" + BackingPhotoTable* _tmp13_; + BackingPhotoTable* _tmp14_; + PhotoRow* _tmp15_; + BackingPhotoID _tmp16_; + const gchar* _tmp17_; + BackingPhotoRow* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; + PhotoBackingReaders* _tmp21_; + BackingPhotoRow* _tmp22_; + PhotoFileFormat _tmp23_; + const gchar* _tmp24_; + PhotoFileReader* _tmp25_; #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = backing_photo_table_get_instance (); + _tmp13_ = backing_photo_table_get_instance (); #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->row; + _tmp15_ = self->row; #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->editable_id; + _tmp16_ = _tmp15_->editable_id; #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = filepath; + _tmp17_ = filepath; #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_set_filepath (_tmp17_, &_tmp19_, _tmp20_, &_inner_error_); + backing_photo_table_set_filepath (_tmp14_, &_tmp16_, _tmp17_, &_inner_error_); #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp17_); + _database_table_unref0 (_tmp14_); #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1901 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp4_); -#line 14934 "Photo.c" + _g_object_unref0 (_tmp3_); +#line 15557 "Photo.c" goto __finally329; } #line 1903 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = self->priv->editable; + _tmp18_ = self->priv->editable; #line 1903 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = filepath; + _tmp19_ = filepath; #line 1903 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = g_strdup (_tmp22_); + _tmp20_ = g_strdup (_tmp19_); #line 1903 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp21_->filepath); + _g_free0 (_tmp18_->filepath); #line 1903 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_->filepath = _tmp23_; + _tmp18_->filepath = _tmp20_; #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = self->priv->readers; + _tmp21_ = self->priv->readers; #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->priv->editable; + _tmp22_ = self->priv->editable; #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_->file_format; + _tmp23_ = _tmp22_->file_format; #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = filepath; + _tmp24_ = filepath; #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = photo_file_format_create_reader (_tmp26_, _tmp27_); + _tmp25_ = photo_file_format_create_reader (_tmp23_, _tmp24_); #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp24_->editable); + _photo_file_adapter_unref0 (_tmp21_->editable); #line 1904 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_->editable = _tmp28_; + _tmp21_->editable = _tmp25_; #line 1906 "/home/jens/Source/shotwell/src/Photo.vala" altered = TRUE; #line 1907 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = photo_is_editable_baseline (self); -#line 1907 "/home/jens/Source/shotwell/src/Photo.vala" - is_baseline = _tmp29_; + is_baseline = photo_is_editable_baseline (self); #line 1908 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = photo_is_editable_source (self); -#line 1908 "/home/jens/Source/shotwell/src/Photo.vala" - is_source = _tmp30_; -#line 14971 "Photo.c" + is_source = photo_is_editable_source (self); +#line 15590 "Photo.c" } #line 1898 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp4_); -#line 14975 "Photo.c" + _g_object_unref0 (_tmp3_); +#line 15594 "Photo.c" } __finally329: { - PhotoBackingReaders* _tmp31_; + PhotoBackingReaders* _tmp26_; #line 1898 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = self->priv->readers; + _tmp26_ = self->priv->readers; #line 1898 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 14984 "Photo.c" +#line 15603 "Photo.c" } #line 1898 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14988 "Photo.c" +#line 15607 "Photo.c" goto __finally328; } } } __finally328: { - PhotoRow* _tmp32_; + PhotoRow* _tmp27_; #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->row; + _tmp27_ = self->row; #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15000 "Photo.c" +#line 15619 "Photo.c" } #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 15006 "Photo.c" +#line 15625 "Photo.c" goto __catch327_database_error; } #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15017,7 +15636,7 @@ void photo_set_editable_file (Photo* self, GFile* file) { g_clear_error (&_inner_error_); #line 1897 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15019 "Photo.c" +#line 15638 "Photo.c" } } } @@ -15025,18 +15644,18 @@ void photo_set_editable_file (Photo* self, GFile* file) { __catch327_database_error: { GError* err = NULL; - GError* _tmp33_; + GError* _tmp28_; #line 1896 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 1896 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 1913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = err; + _tmp28_ = err; #line 1913 "/home/jens/Source/shotwell/src/Photo.vala" - app_window_database_error (_tmp33_); + app_window_database_error (_tmp28_); #line 1896 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 15038 "Photo.c" +#line 15657 "Photo.c" } __finally327: #line 1896 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15051,174 +15670,168 @@ void photo_set_editable_file (Photo* self, GFile* file) { g_clear_error (&_inner_error_); #line 1896 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15053 "Photo.c" +#line 15672 "Photo.c" } #line 1916 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = altered; + _tmp29_ = altered; #line 1916 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp34_) { -#line 15059 "Photo.c" - GFile* _tmp35_; - GFile* _tmp36_; - gboolean _tmp37_; + if (_tmp29_) { +#line 15678 "Photo.c" + GFile* _tmp30_; + gboolean _tmp31_; gchar** alteration_list = NULL; - gchar** _tmp38_; + gchar** _tmp32_; gint alteration_list_length1; gint _alteration_list_size_; - gchar** _tmp39_; - gint _tmp39__length1; - gchar* _tmp40_; - gboolean _tmp41_; - gboolean _tmp44_; - gchar** _tmp47_; - gint _tmp47__length1; - Alteration* _tmp48_; - Alteration* _tmp49_; -#line 1917 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = old_file; + gchar** _tmp33_; + gint _tmp33__length1; + gchar* _tmp34_; + gboolean _tmp35_; + gboolean _tmp38_; + gchar** _tmp41_; + gint _tmp41__length1; + Alteration* _tmp42_; + Alteration* _tmp43_; #line 1917 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = file; + _tmp30_ = old_file; #line 1917 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_editable_replaced (self, _tmp35_, _tmp36_); + photo_notify_editable_replaced (self, _tmp30_, file); #line 1919 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = is_baseline; + _tmp31_ = is_baseline; #line 1919 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp37_) { + if (_tmp31_) { #line 1920 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); -#line 15088 "Photo.c" +#line 15704 "Photo.c" } #line 1922 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = g_new0 (gchar*, 0 + 1); + _tmp32_ = g_new0 (gchar*, 0 + 1); #line 1922 "/home/jens/Source/shotwell/src/Photo.vala" - alteration_list = _tmp38_; + alteration_list = _tmp32_; #line 1922 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list_length1 = 0; #line 1922 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_list_size_ = alteration_list_length1; #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = alteration_list; + _tmp33_ = alteration_list; #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39__length1 = alteration_list_length1; + _tmp33__length1 = alteration_list_length1; #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = g_strdup ("backing:editable"); + _tmp34_ = g_strdup ("backing:editable"); #line 1923 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_); + _vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp34_); #line 1925 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = is_baseline; + _tmp35_ = is_baseline; #line 1925 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp41_) { -#line 15110 "Photo.c" - gchar** _tmp42_; - gint _tmp42__length1; - gchar* _tmp43_; + if (_tmp35_) { +#line 15726 "Photo.c" + gchar** _tmp36_; + gint _tmp36__length1; + gchar* _tmp37_; #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = alteration_list; + _tmp36_ = alteration_list; #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42__length1 = alteration_list_length1; + _tmp36__length1 = alteration_list_length1; #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = g_strdup ("backing:baseline"); + _tmp37_ = g_strdup ("backing:baseline"); #line 1926 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_); -#line 15122 "Photo.c" + _vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp37_); +#line 15738 "Photo.c" } #line 1928 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = is_source; + _tmp38_ = is_source; #line 1928 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_) { -#line 15128 "Photo.c" - gchar** _tmp45_; - gint _tmp45__length1; - gchar* _tmp46_; + if (_tmp38_) { +#line 15744 "Photo.c" + gchar** _tmp39_; + gint _tmp39__length1; + gchar* _tmp40_; #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = alteration_list; + _tmp39_ = alteration_list; #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45__length1 = alteration_list_length1; + _tmp39__length1 = alteration_list_length1; #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = g_strdup ("backing:source"); + _tmp40_ = g_strdup ("backing:source"); #line 1929 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_); -#line 15140 "Photo.c" + _vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_); +#line 15756 "Photo.c" } #line 1931 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = alteration_list; + _tmp41_ = alteration_list; #line 1931 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47__length1 = alteration_list_length1; + _tmp41__length1 = alteration_list_length1; #line 1931 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = alteration_new_from_array (_tmp47_, _tmp47__length1); + _tmp42_ = alteration_new_from_array (_tmp41_, _tmp41__length1); #line 1931 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_; + _tmp43_ = _tmp42_; #line 1931 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp49_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp43_); #line 1931 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp49_); + _alteration_unref0 (_tmp43_); #line 1916 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); -#line 15156 "Photo.c" +#line 15772 "Photo.c" } #line 1889 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (old_file); #line 1889 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (filepath); -#line 15162 "Photo.c" +#line 15778 "Photo.c" } -void photo_set_many_editable_file (GeeMap* map, GError** error) { +void +photo_set_many_editable_file (GeeMap* map, + GError** error) +{ GeeMapIterator* map_iter = NULL; - GeeMap* _tmp0_; - GeeMapIterator* _tmp1_; + GeeMapIterator* _tmp0_; GError * _inner_error_ = NULL; #line 1936 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 1937 "/home/jens/Source/shotwell/src/Photo.vala" database_table_begin_transaction (); #line 1939 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = map; -#line 1939 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_map_map_iterator (_tmp0_); + _tmp0_ = gee_map_map_iterator (map); #line 1939 "/home/jens/Source/shotwell/src/Photo.vala" - map_iter = _tmp1_; + map_iter = _tmp0_; #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 15183 "Photo.c" +#line 15799 "Photo.c" + GeeMapIterator* _tmp1_; GeeMapIterator* _tmp2_; - gboolean _tmp3_; - GeeMapIterator* _tmp4_; - gpointer _tmp5_; - Photo* _tmp6_; - GeeMapIterator* _tmp7_; - gpointer _tmp8_; - GFile* _tmp9_; -#line 1940 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = map_iter; + gpointer _tmp3_; + Photo* _tmp4_; + GeeMapIterator* _tmp5_; + gpointer _tmp6_; + GFile* _tmp7_; #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_map_iterator_next (_tmp2_); + _tmp1_ = map_iter; #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { + if (!gee_map_iterator_next (_tmp1_)) { #line 1940 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 15200 "Photo.c" +#line 15813 "Photo.c" } #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = map_iter; + _tmp2_ = map_iter; #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_map_iterator_get_key (_tmp4_); + _tmp3_ = gee_map_iterator_get_key (_tmp2_); #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = (Photo*) _tmp5_; + _tmp4_ = (Photo*) _tmp3_; #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = map_iter; + _tmp5_ = map_iter; #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = gee_map_iterator_get_value (_tmp7_); + _tmp6_ = gee_map_iterator_get_value (_tmp5_); #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = (GFile*) _tmp8_; + _tmp7_ = (GFile*) _tmp6_; #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_editable_file (_tmp6_, _tmp9_); + photo_set_editable_file (_tmp4_, _tmp7_); #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp7_); #line 1941 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp6_); -#line 15220 "Photo.c" + _g_object_unref0 (_tmp4_); +#line 15833 "Photo.c" } #line 1943 "/home/jens/Source/shotwell/src/Photo.vala" database_table_commit_transaction (&_inner_error_); @@ -15232,7 +15845,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) { _g_object_unref0 (map_iter); #line 1943 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15234 "Photo.c" +#line 15847 "Photo.c" } else { #line 1943 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map_iter); @@ -15242,16 +15855,18 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) { g_clear_error (&_inner_error_); #line 1943 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15244 "Photo.c" +#line 15857 "Photo.c" } } #line 1936 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map_iter); -#line 15249 "Photo.c" +#line 15862 "Photo.c" } -GFile* photo_get_actual_file (Photo* self) { +GFile* +photo_get_actual_file (Photo* self) +{ GFile* result = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; @@ -15273,11 +15888,13 @@ GFile* photo_get_actual_file (Photo* self) { result = _tmp3_; #line 1949 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15275 "Photo.c" +#line 15890 "Photo.c" } -static GFile* photo_real_get_master_file (MediaSource* base) { +static GFile* +photo_real_get_master_file (MediaSource* base) +{ Photo * self; GFile* result = NULL; PhotoFileReader* _tmp0_; @@ -15300,11 +15917,13 @@ static GFile* photo_real_get_master_file (MediaSource* base) { result = _tmp3_; #line 1953 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15302 "Photo.c" +#line 15919 "Photo.c" } -GFile* photo_get_editable_file (Photo* self) { +GFile* +photo_get_editable_file (Photo* self) +{ GFile* result = NULL; PhotoFileReader* reader = NULL; PhotoFileReader* _tmp0_; @@ -15320,7 +15939,7 @@ GFile* photo_get_editable_file (Photo* self) { _tmp2_ = reader; #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 15322 "Photo.c" +#line 15941 "Photo.c" PhotoFileReader* _tmp3_; GFile* _tmp4_; #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" @@ -15331,13 +15950,13 @@ GFile* photo_get_editable_file (Photo* self) { _g_object_unref0 (_tmp1_); #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp4_; -#line 15333 "Photo.c" +#line 15952 "Photo.c" } else { #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 15339 "Photo.c" +#line 15958 "Photo.c" } #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; @@ -15345,125 +15964,121 @@ GFile* photo_get_editable_file (Photo* self) { _photo_file_adapter_unref0 (reader); #line 1959 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15347 "Photo.c" +#line 15966 "Photo.c" } -GeeCollection* photo_get_raw_developer_files (Photo* self) { +GeeCollection* +photo_get_raw_developer_files (Photo* self) +{ GeeCollection* result = NULL; - PhotoFileFormat _tmp0_; GeeArrayList* ret = NULL; - GeeArrayList* _tmp1_; + GeeArrayList* _tmp0_; GError * _inner_error_ = NULL; #line 1962 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 1963 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_get_master_file_format (self); -#line 1963 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) { + if (photo_get_master_file_format (self) != PHOTO_FILE_FORMAT_RAW) { #line 1964 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; #line 1964 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15367 "Photo.c" +#line 15985 "Photo.c" } #line 1966 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1966 "/home/jens/Source/shotwell/src/Photo.vala" - ret = _tmp1_; -#line 15373 "Photo.c" + ret = _tmp0_; +#line 15991 "Photo.c" { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 1967 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 1967 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15380 "Photo.c" +#line 15998 "Photo.c" { { GeeIterator* _row_it = NULL; - GeeHashMap* _tmp3_; + GeeHashMap* _tmp2_; + GeeCollection* _tmp3_; GeeCollection* _tmp4_; GeeCollection* _tmp5_; - GeeCollection* _tmp6_; + GeeIterator* _tmp6_; GeeIterator* _tmp7_; - GeeIterator* _tmp8_; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->developments; + _tmp2_ = self->priv->developments; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp3_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); +#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp4_ = _tmp3_; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = _tmp6_; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _g_object_unref0 (_tmp5_); #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp6_); -#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _row_it = _tmp8_; + _row_it = _tmp7_; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 15408 "Photo.c" - GeeIterator* _tmp9_; - gboolean _tmp10_; +#line 16026 "Photo.c" + GeeIterator* _tmp8_; BackingPhotoRow* row = NULL; - GeeIterator* _tmp11_; - gpointer _tmp12_; - GeeArrayList* _tmp13_; - BackingPhotoRow* _tmp14_; - const gchar* _tmp15_; - GFile* _tmp16_; - GFile* _tmp17_; -#line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _row_it; + GeeIterator* _tmp9_; + gpointer _tmp10_; + GeeArrayList* _tmp11_; + BackingPhotoRow* _tmp12_; + const gchar* _tmp13_; + GFile* _tmp14_; + GFile* _tmp15_; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = gee_iterator_next (_tmp9_); + _tmp8_ = _row_it; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp10_) { + if (!gee_iterator_next (_tmp8_)) { #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 15427 "Photo.c" +#line 16042 "Photo.c" } #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _row_it; + _tmp9_ = _row_it; #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = gee_iterator_get (_tmp11_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" - row = (BackingPhotoRow*) _tmp12_; + row = (BackingPhotoRow*) _tmp10_; #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = ret; + _tmp11_ = ret; #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = row; + _tmp12_ = row; #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->filepath; + _tmp13_ = _tmp12_->filepath; #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = g_file_new_for_path (_tmp15_); + _tmp14_ = g_file_new_for_path (_tmp13_); #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); #line 1969 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp15_); #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 15451 "Photo.c" +#line 16066 "Photo.c" } #line 1968 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 15455 "Photo.c" +#line 16070 "Photo.c" } } __finally330: { - PhotoRow* _tmp18_; + PhotoRow* _tmp16_; #line 1967 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->row; + _tmp16_ = self->row; #line 1967 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15465 "Photo.c" +#line 16080 "Photo.c" } #line 1967 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -15475,18 +16090,20 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { g_clear_error (&_inner_error_); #line 1967 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 15477 "Photo.c" +#line 16092 "Photo.c" } } #line 1972 "/home/jens/Source/shotwell/src/Photo.vala" result = G_TYPE_CHECK_INSTANCE_CAST (ret, GEE_TYPE_COLLECTION, GeeCollection); #line 1972 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15484 "Photo.c" +#line 16099 "Photo.c" } -GFile* photo_get_source_file (Photo* self) { +GFile* +photo_get_source_file (Photo* self) +{ GFile* result = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; @@ -15508,23 +16125,25 @@ GFile* photo_get_source_file (Photo* self) { result = _tmp3_; #line 1976 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15510 "Photo.c" +#line 16127 "Photo.c" } -PhotoFileFormat photo_get_file_format (Photo* self) { +PhotoFileFormat +photo_get_file_format (Photo* self) +{ PhotoFileFormat result = 0; GError * _inner_error_ = NULL; #line 1979 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 15519 "Photo.c" +#line 16138 "Photo.c" { PhotoRow* _tmp0_; #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15526 "Photo.c" +#line 16145 "Photo.c" { BackingPhotoRow* _tmp1_; PhotoFileFormat _tmp2_; @@ -15534,18 +16153,18 @@ PhotoFileFormat photo_get_file_format (Photo* self) { _tmp2_ = _tmp1_->file_format; #line 1981 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 15536 "Photo.c" +#line 16155 "Photo.c" { PhotoRow* _tmp3_; #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15543 "Photo.c" +#line 16162 "Photo.c" } #line 1981 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15547 "Photo.c" +#line 16166 "Photo.c" } __finally331: { @@ -15554,7 +16173,7 @@ PhotoFileFormat photo_get_file_format (Photo* self) { _tmp4_ = self->row; #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15556 "Photo.c" +#line 16175 "Photo.c" } #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15562,91 +16181,82 @@ PhotoFileFormat photo_get_file_format (Photo* self) { g_clear_error (&_inner_error_); #line 1980 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 15564 "Photo.c" +#line 16183 "Photo.c" } } -PhotoFileFormat photo_get_best_export_file_format (Photo* self) { +PhotoFileFormat +photo_get_best_export_file_format (Photo* self) +{ PhotoFileFormat result = 0; PhotoFileFormat file_format = 0; PhotoFileFormat _tmp0_; - PhotoFileFormat _tmp1_; - gboolean _tmp2_; #line 1985 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); #line 1986 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_get_file_format (self); -#line 1986 "/home/jens/Source/shotwell/src/Photo.vala" - file_format = _tmp0_; -#line 1987 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file_format; + file_format = photo_get_file_format (self); #line 1987 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_format_can_write (_tmp1_); + _tmp0_ = file_format; #line 1987 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp2_) { -#line 15587 "Photo.c" - PhotoFileFormat _tmp3_; -#line 1988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_format_get_system_default_format (); + if (!photo_file_format_can_write (_tmp0_)) { #line 1988 "/home/jens/Source/shotwell/src/Photo.vala" - file_format = _tmp3_; -#line 15593 "Photo.c" + file_format = photo_file_format_get_system_default_format (); +#line 16204 "Photo.c" } #line 1990 "/home/jens/Source/shotwell/src/Photo.vala" result = file_format; #line 1990 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15599 "Photo.c" +#line 16210 "Photo.c" } -PhotoFileFormat photo_get_master_file_format (Photo* self) { +PhotoFileFormat +photo_get_master_file_format (Photo* self) +{ PhotoFileFormat result = 0; GError * _inner_error_ = NULL; #line 1993 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 15608 "Photo.c" +#line 16221 "Photo.c" { PhotoRow* _tmp0_; #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15615 "Photo.c" +#line 16228 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; - PhotoFileFormat _tmp3_; #line 1995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; #line 1995 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->master; #line 1995 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 1995 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; -#line 15628 "Photo.c" + result = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); +#line 16238 "Photo.c" { - PhotoRow* _tmp4_; + PhotoRow* _tmp3_; #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15635 "Photo.c" +#line 16245 "Photo.c" } #line 1995 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15639 "Photo.c" +#line 16249 "Photo.c" } __finally332: { - PhotoRow* _tmp5_; + PhotoRow* _tmp4_; #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp4_ = self->row; #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15648 "Photo.c" +#line 16258 "Photo.c" } #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15654,18 +16264,20 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) { g_clear_error (&_inner_error_); #line 1994 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 15656 "Photo.c" +#line 16266 "Photo.c" } } -static time_t photo_real_get_timestamp (MediaSource* base) { +static time_t +photo_real_get_timestamp (MediaSource* base) +{ Photo * self; time_t result = 0; GError * _inner_error_ = NULL; #line 1999 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15667 "Photo.c" +#line 16279 "Photo.c" { PhotoRow* _tmp0_; time_t _tmp5_ = 0; @@ -15673,7 +16285,7 @@ static time_t photo_real_get_timestamp (MediaSource* base) { _tmp0_ = self->row; #line 2000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15675 "Photo.c" +#line 16287 "Photo.c" { BackingPhotoRow* _tmp1_; time_t _tmp2_; @@ -15683,18 +16295,18 @@ static time_t photo_real_get_timestamp (MediaSource* base) { _tmp2_ = _tmp1_->timestamp; #line 2001 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 15685 "Photo.c" +#line 16297 "Photo.c" { PhotoRow* _tmp3_; #line 2000 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15692 "Photo.c" +#line 16304 "Photo.c" } #line 2001 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15696 "Photo.c" +#line 16308 "Photo.c" } __finally333: { @@ -15703,7 +16315,7 @@ static time_t photo_real_get_timestamp (MediaSource* base) { _tmp4_ = self->row; #line 2000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15705 "Photo.c" +#line 16317 "Photo.c" } #line 2000 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15711,23 +16323,26 @@ static time_t photo_real_get_timestamp (MediaSource* base) { g_clear_error (&_inner_error_); #line 2000 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 15713 "Photo.c" +#line 16325 "Photo.c" } } -void photo_get_photo_id (Photo* self, PhotoID* result) { +void +photo_get_photo_id (Photo* self, + PhotoID* result) +{ GError * _inner_error_ = NULL; #line 2005 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 15722 "Photo.c" +#line 16337 "Photo.c" { PhotoRow* _tmp0_; #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15729 "Photo.c" +#line 16344 "Photo.c" { PhotoRow* _tmp1_; PhotoID _tmp2_; @@ -15737,18 +16352,18 @@ void photo_get_photo_id (Photo* self, PhotoID* result) { _tmp2_ = _tmp1_->photo_id; #line 2007 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15739 "Photo.c" +#line 16354 "Photo.c" { PhotoRow* _tmp3_; #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15746 "Photo.c" +#line 16361 "Photo.c" } #line 2007 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15750 "Photo.c" +#line 16365 "Photo.c" } __finally334: { @@ -15757,7 +16372,7 @@ void photo_get_photo_id (Photo* self, PhotoID* result) { _tmp4_ = self->row; #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15759 "Photo.c" +#line 16374 "Photo.c" } #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15765,12 +16380,15 @@ void photo_get_photo_id (Photo* self, PhotoID* result) { g_clear_error (&_inner_error_); #line 2006 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15767 "Photo.c" +#line 16382 "Photo.c" } } -static inline void photo_real_get_event_id (MediaSource* base, EventID* result) { +static inline void +photo_real_get_event_id (MediaSource* base, + EventID* result) +{ Photo * self; PhotoRow* _tmp0_; EventID _tmp1_; @@ -15784,11 +16402,13 @@ static inline void photo_real_get_event_id (MediaSource* base, EventID* result) *result = _tmp1_; #line 2013 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15786 "Photo.c" +#line 16404 "Photo.c" } -inline gint64 photo_get_raw_event_id (Photo* self) { +inline gint64 +photo_get_raw_event_id (Photo* self) +{ gint64 result = 0LL; PhotoRow* _tmp0_; EventID _tmp1_; @@ -15805,23 +16425,26 @@ inline gint64 photo_get_raw_event_id (Photo* self) { result = _tmp2_; #line 2018 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15807 "Photo.c" +#line 16427 "Photo.c" } -static void photo_real_get_import_id (MediaSource* base, ImportID* result) { +static void +photo_real_get_import_id (MediaSource* base, + ImportID* result) +{ Photo * self; GError * _inner_error_ = NULL; #line 2021 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15816 "Photo.c" +#line 16439 "Photo.c" { PhotoRow* _tmp0_; #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15823 "Photo.c" +#line 16446 "Photo.c" { PhotoRow* _tmp1_; ImportID _tmp2_; @@ -15831,18 +16454,18 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) { _tmp2_ = _tmp1_->import_id; #line 2023 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15833 "Photo.c" +#line 16456 "Photo.c" { PhotoRow* _tmp3_; #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15840 "Photo.c" +#line 16463 "Photo.c" } #line 2023 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15844 "Photo.c" +#line 16467 "Photo.c" } __finally335: { @@ -15851,7 +16474,7 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) { _tmp4_ = self->row; #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15853 "Photo.c" +#line 16476 "Photo.c" } #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15859,23 +16482,26 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) { g_clear_error (&_inner_error_); #line 2022 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15861 "Photo.c" +#line 16484 "Photo.c" } } -void photo_get_editable_id (Photo* self, BackingPhotoID* result) { +void +photo_get_editable_id (Photo* self, + BackingPhotoID* result) +{ GError * _inner_error_ = NULL; #line 2027 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 15870 "Photo.c" +#line 16496 "Photo.c" { PhotoRow* _tmp0_; #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15877 "Photo.c" +#line 16503 "Photo.c" { PhotoRow* _tmp1_; BackingPhotoID _tmp2_; @@ -15885,18 +16511,18 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) { _tmp2_ = _tmp1_->editable_id; #line 2029 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 15887 "Photo.c" +#line 16513 "Photo.c" { PhotoRow* _tmp3_; #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15894 "Photo.c" +#line 16520 "Photo.c" } #line 2029 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15898 "Photo.c" +#line 16524 "Photo.c" } __finally336: { @@ -15905,7 +16531,7 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) { _tmp4_ = self->row; #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15907 "Photo.c" +#line 16533 "Photo.c" } #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15913,25 +16539,27 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) { g_clear_error (&_inner_error_); #line 2028 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 15915 "Photo.c" +#line 16541 "Photo.c" } } -static gchar* photo_real_get_master_md5 (MediaSource* base) { +static gchar* +photo_real_get_master_md5 (MediaSource* base) +{ Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; #line 2033 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 15926 "Photo.c" +#line 16554 "Photo.c" { PhotoRow* _tmp0_; #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15933 "Photo.c" +#line 16561 "Photo.c" { PhotoRow* _tmp1_; const gchar* _tmp2_; @@ -15944,18 +16572,18 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { _tmp3_ = g_strdup (_tmp2_); #line 2035 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 15946 "Photo.c" +#line 16574 "Photo.c" { PhotoRow* _tmp4_; #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15953 "Photo.c" +#line 16581 "Photo.c" } #line 2035 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 15957 "Photo.c" +#line 16585 "Photo.c" } __finally337: { @@ -15964,7 +16592,7 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { _tmp5_ = self->row; #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 15966 "Photo.c" +#line 16594 "Photo.c" } #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -15972,17 +16600,19 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) { g_clear_error (&_inner_error_); #line 2034 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 15974 "Photo.c" +#line 16602 "Photo.c" } } -guint64 photo_get_flags (Photo* self) { +guint64 +photo_get_flags (Photo* self) +{ guint64 result = 0ULL; GError * _inner_error_ = NULL; #line 2041 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 15984 "Photo.c" +#line 16614 "Photo.c" { PhotoRow* _tmp0_; guint64 _tmp5_ = 0ULL; @@ -15990,7 +16620,7 @@ guint64 photo_get_flags (Photo* self) { _tmp0_ = self->row; #line 2042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 15992 "Photo.c" +#line 16622 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; @@ -16000,18 +16630,18 @@ guint64 photo_get_flags (Photo* self) { _tmp2_ = _tmp1_->flags; #line 2043 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 16002 "Photo.c" +#line 16632 "Photo.c" { PhotoRow* _tmp3_; #line 2042 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16009 "Photo.c" +#line 16639 "Photo.c" } #line 2043 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16013 "Photo.c" +#line 16643 "Photo.c" } __finally338: { @@ -16020,7 +16650,7 @@ guint64 photo_get_flags (Photo* self) { _tmp4_ = self->row; #line 2042 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16022 "Photo.c" +#line 16652 "Photo.c" } #line 2042 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -16028,16 +16658,18 @@ guint64 photo_get_flags (Photo* self) { g_clear_error (&_inner_error_); #line 2042 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 16030 "Photo.c" +#line 16660 "Photo.c" } } -static void photo_notify_flags_altered (Photo* self, Alteration* additional_alteration) { +static void +photo_notify_flags_altered (Photo* self, + Alteration* additional_alteration) +{ Alteration* alteration = NULL; Alteration* _tmp0_; - Alteration* _tmp1_; - Alteration* _tmp5_; + Alteration* _tmp3_; #line 2047 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2047 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16047,60 +16679,56 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte #line 2048 "/home/jens/Source/shotwell/src/Photo.vala" alteration = _tmp0_; #line 2049 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = additional_alteration; -#line 2049 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_ != NULL) { -#line 16052 "Photo.c" + if (additional_alteration != NULL) { +#line 16682 "Photo.c" + Alteration* _tmp1_; Alteration* _tmp2_; - Alteration* _tmp3_; - Alteration* _tmp4_; #line 2050 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = alteration; + _tmp1_ = alteration; #line 2050 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = additional_alteration; -#line 2050 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = alteration_compress (_tmp2_, _tmp3_); + _tmp2_ = alteration_compress (_tmp1_, additional_alteration); #line 2050 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (alteration); #line 2050 "/home/jens/Source/shotwell/src/Photo.vala" - alteration = _tmp4_; -#line 16066 "Photo.c" + alteration = _tmp2_; +#line 16693 "Photo.c" } #line 2052 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = alteration; + _tmp3_ = alteration; #line 2052 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp3_); #line 2047 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (alteration); -#line 16074 "Photo.c" +#line 16701 "Photo.c" } -guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_alteration) { +guint64 +photo_replace_flags (Photo* self, + guint64 flags, + Alteration* additional_alteration) +{ guint64 result = 0ULL; gboolean committed = FALSE; - gboolean _tmp11_; - guint64 _tmp13_; + gboolean _tmp8_; GError * _inner_error_ = NULL; #line 2055 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); #line 2055 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL); -#line 16088 "Photo.c" +#line 16718 "Photo.c" { PhotoRow* _tmp0_; #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16095 "Photo.c" +#line 16725 "Photo.c" { PhotoTable* _tmp1_; PhotoTable* _tmp2_; PhotoID _tmp3_ = {0}; - guint64 _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + gboolean _tmp4_; #line 2058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); #line 2058 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16108,140 +16736,128 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_ #line 2058 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp3_); #line 2058 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = flags; -#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_table_replace_flags (_tmp2_, &_tmp3_, _tmp4_); -#line 2058 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp5_; + committed = photo_table_replace_flags (_tmp2_, &_tmp3_, flags); #line 2058 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); #line 2059 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = committed; + _tmp4_ = committed; #line 2059 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { -#line 16121 "Photo.c" - PhotoRow* _tmp7_; - guint64 _tmp8_; -#line 2060 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + if (_tmp4_) { +#line 16745 "Photo.c" + PhotoRow* _tmp5_; #line 2060 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = flags; + _tmp5_ = self->row; #line 2060 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_->flags = _tmp8_; -#line 16130 "Photo.c" + _tmp5_->flags = flags; +#line 16751 "Photo.c" } } __finally339: { - PhotoRow* _tmp9_; + PhotoRow* _tmp6_; #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = self->row; + _tmp6_ = self->row; #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16140 "Photo.c" +#line 16761 "Photo.c" } #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16144 "Photo.c" - guint64 _tmp10_ = 0ULL; +#line 16765 "Photo.c" + guint64 _tmp7_ = 0ULL; #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2057 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp10_; -#line 16152 "Photo.c" + return _tmp7_; +#line 16773 "Photo.c" } } #line 2063 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = committed; + _tmp8_ = committed; #line 2063 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 16159 "Photo.c" - Alteration* _tmp12_; -#line 2064 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = additional_alteration; + if (_tmp8_) { #line 2064 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp12_); -#line 16165 "Photo.c" + photo_notify_flags_altered (self, additional_alteration); +#line 16782 "Photo.c" } #line 2066 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = flags; -#line 2066 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp13_; + result = flags; #line 2066 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16173 "Photo.c" +#line 16788 "Photo.c" } -gboolean photo_is_flag_set (Photo* self, guint64 mask) { +gboolean +photo_is_flag_set (Photo* self, + guint64 mask) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 2069 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 16182 "Photo.c" +#line 16800 "Photo.c" { PhotoRow* _tmp0_; - gboolean _tmp7_ = FALSE; + gboolean _tmp5_ = FALSE; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16190 "Photo.c" +#line 16808 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; - guint64 _tmp3_; - gboolean _tmp4_; #line 2071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2071 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; #line 2071 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = mask; -#line 2071 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_); -#line 2071 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; -#line 16206 "Photo.c" + result = media_source_internal_is_flag_set (_tmp2_, mask); +#line 16818 "Photo.c" { - PhotoRow* _tmp5_; + PhotoRow* _tmp3_; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp3_ = self->row; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16213 "Photo.c" +#line 16825 "Photo.c" } #line 2071 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16217 "Photo.c" +#line 16829 "Photo.c" } __finally340: { - PhotoRow* _tmp6_; + PhotoRow* _tmp4_; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp4_ = self->row; #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16226 "Photo.c" +#line 16838 "Photo.c" } #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2070 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp7_; -#line 16234 "Photo.c" + return _tmp5_; +#line 16846 "Photo.c" } } -guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alteration) { +guint64 +photo_add_flags (Photo* self, + guint64 mask, + Alteration* additional_alteration) +{ guint64 result = 0ULL; guint64 flags = 0ULL; gboolean committed = FALSE; - gboolean _tmp18_; + gboolean _tmp15_; GError * _inner_error_ = NULL; #line 2075 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); @@ -16251,125 +16867,116 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter flags = (guint64) 0; #line 2078 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16253 "Photo.c" +#line 16869 "Photo.c" { PhotoRow* _tmp0_; #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16260 "Photo.c" +#line 16876 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; - guint64 _tmp3_; + PhotoRow* _tmp3_; guint64 _tmp4_; - PhotoRow* _tmp5_; - guint64 _tmp6_; - guint64 _tmp7_; + guint64 _tmp5_; #line 2080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2080 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; #line 2080 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = mask; -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_); -#line 2080 "/home/jens/Source/shotwell/src/Photo.vala" - flags = _tmp4_; + flags = media_source_internal_add_flags (_tmp2_, mask); #line 2081 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp3_ = self->row; #line 2081 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_->flags; + _tmp4_ = _tmp3_->flags; #line 2081 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = flags; + _tmp5_ = flags; #line 2081 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_ != _tmp7_) { -#line 16287 "Photo.c" - PhotoTable* _tmp8_; - PhotoTable* _tmp9_; - PhotoID _tmp10_ = {0}; - guint64 _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; -#line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_table_get_instance (); + if (_tmp4_ != _tmp5_) { +#line 16897 "Photo.c" + PhotoTable* _tmp6_; + PhotoTable* _tmp7_; + PhotoID _tmp8_ = {0}; + guint64 _tmp9_; + gboolean _tmp10_; #line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp6_ = photo_table_get_instance (); #line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp10_); + _tmp7_ = _tmp6_; #line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = flags; + photo_get_photo_id (self, &_tmp8_); #line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_); + _tmp9_ = flags; #line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp12_; + committed = photo_table_replace_flags (_tmp7_, &_tmp8_, _tmp9_); #line 2082 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp9_); + _database_table_unref0 (_tmp7_); #line 2083 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = committed; + _tmp10_ = committed; #line 2083 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_) { -#line 16312 "Photo.c" - PhotoRow* _tmp14_; - guint64 _tmp15_; + if (_tmp10_) { +#line 16919 "Photo.c" + PhotoRow* _tmp11_; + guint64 _tmp12_; #line 2084 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp11_ = self->row; #line 2084 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = flags; + _tmp12_ = flags; #line 2084 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_->flags = _tmp15_; -#line 16321 "Photo.c" + _tmp11_->flags = _tmp12_; +#line 16928 "Photo.c" } } } __finally341: { - PhotoRow* _tmp16_; + PhotoRow* _tmp13_; #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->row; + _tmp13_ = self->row; #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16332 "Photo.c" +#line 16939 "Photo.c" } #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16336 "Photo.c" - guint64 _tmp17_ = 0ULL; +#line 16943 "Photo.c" + guint64 _tmp14_ = 0ULL; #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 2079 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2079 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp17_; -#line 16344 "Photo.c" + return _tmp14_; +#line 16951 "Photo.c" } } #line 2088 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = committed; + _tmp15_ = committed; #line 2088 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_) { -#line 16351 "Photo.c" - Alteration* _tmp19_; -#line 2089 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = additional_alteration; + if (_tmp15_) { #line 2089 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp19_); -#line 16357 "Photo.c" + photo_notify_flags_altered (self, additional_alteration); +#line 16960 "Photo.c" } #line 2091 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; #line 2091 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16363 "Photo.c" +#line 16966 "Photo.c" } -guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_alteration) { +guint64 +photo_remove_flags (Photo* self, + guint64 mask, + Alteration* additional_alteration) +{ guint64 result = 0ULL; guint64 flags = 0ULL; gboolean committed = FALSE; - gboolean _tmp18_; + gboolean _tmp15_; GError * _inner_error_ = NULL; #line 2094 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); @@ -16379,125 +16986,117 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al flags = (guint64) 0; #line 2097 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16381 "Photo.c" +#line 16988 "Photo.c" { PhotoRow* _tmp0_; #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16388 "Photo.c" +#line 16995 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; - guint64 _tmp3_; + PhotoRow* _tmp3_; guint64 _tmp4_; - PhotoRow* _tmp5_; - guint64 _tmp6_; - guint64 _tmp7_; + guint64 _tmp5_; #line 2099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2099 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; #line 2099 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = mask; -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_); -#line 2099 "/home/jens/Source/shotwell/src/Photo.vala" - flags = _tmp4_; + flags = media_source_internal_remove_flags (_tmp2_, mask); #line 2100 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp3_ = self->row; #line 2100 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_->flags; + _tmp4_ = _tmp3_->flags; #line 2100 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = flags; + _tmp5_ = flags; #line 2100 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_ != _tmp7_) { -#line 16415 "Photo.c" - PhotoTable* _tmp8_; - PhotoTable* _tmp9_; - PhotoID _tmp10_ = {0}; - guint64 _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; -#line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_table_get_instance (); + if (_tmp4_ != _tmp5_) { +#line 17016 "Photo.c" + PhotoTable* _tmp6_; + PhotoTable* _tmp7_; + PhotoID _tmp8_ = {0}; + guint64 _tmp9_; + gboolean _tmp10_; #line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp6_ = photo_table_get_instance (); #line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp10_); + _tmp7_ = _tmp6_; #line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = flags; + photo_get_photo_id (self, &_tmp8_); #line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_); + _tmp9_ = flags; #line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp12_; + committed = photo_table_replace_flags (_tmp7_, &_tmp8_, _tmp9_); #line 2101 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp9_); + _database_table_unref0 (_tmp7_); #line 2102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = committed; + _tmp10_ = committed; #line 2102 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_) { -#line 16440 "Photo.c" - PhotoRow* _tmp14_; - guint64 _tmp15_; + if (_tmp10_) { +#line 17038 "Photo.c" + PhotoRow* _tmp11_; + guint64 _tmp12_; #line 2103 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp11_ = self->row; #line 2103 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = flags; + _tmp12_ = flags; #line 2103 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_->flags = _tmp15_; -#line 16449 "Photo.c" + _tmp11_->flags = _tmp12_; +#line 17047 "Photo.c" } } } __finally342: { - PhotoRow* _tmp16_; + PhotoRow* _tmp13_; #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->row; + _tmp13_ = self->row; #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16460 "Photo.c" +#line 17058 "Photo.c" } #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16464 "Photo.c" - guint64 _tmp17_ = 0ULL; +#line 17062 "Photo.c" + guint64 _tmp14_ = 0ULL; #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 2098 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2098 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp17_; -#line 16472 "Photo.c" + return _tmp14_; +#line 17070 "Photo.c" } } #line 2107 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = committed; + _tmp15_ = committed; #line 2107 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_) { -#line 16479 "Photo.c" - Alteration* _tmp19_; -#line 2108 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = additional_alteration; + if (_tmp15_) { #line 2108 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp19_); -#line 16485 "Photo.c" + photo_notify_flags_altered (self, additional_alteration); +#line 17079 "Photo.c" } #line 2110 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; #line 2110 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16491 "Photo.c" +#line 17085 "Photo.c" } -guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Alteration* additional_alteration) { +guint64 +photo_add_remove_flags (Photo* self, + guint64 add, + guint64 remove, + Alteration* additional_alteration) +{ guint64 result = 0ULL; guint64 flags = 0ULL; gboolean committed = FALSE; - gboolean _tmp18_; + gboolean _tmp15_; GError * _inner_error_ = NULL; #line 2113 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); @@ -16507,123 +17106,116 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera flags = (guint64) 0; #line 2116 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16509 "Photo.c" +#line 17108 "Photo.c" { PhotoRow* _tmp0_; #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16516 "Photo.c" +#line 17115 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; - guint64 _tmp3_; + PhotoRow* _tmp3_; guint64 _tmp4_; - PhotoRow* _tmp5_; - guint64 _tmp6_; - guint64 _tmp7_; + guint64 _tmp5_; #line 2118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2118 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; #line 2118 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = add; -#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = remove; -#line 2118 "/home/jens/Source/shotwell/src/Photo.vala" - flags = (_tmp2_ | _tmp3_) & (~_tmp4_); + flags = (_tmp2_ | add) & (~remove); #line 2119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp3_ = self->row; #line 2119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_->flags; + _tmp4_ = _tmp3_->flags; #line 2119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = flags; + _tmp5_ = flags; #line 2119 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_ != _tmp7_) { -#line 16543 "Photo.c" - PhotoTable* _tmp8_; - PhotoTable* _tmp9_; - PhotoID _tmp10_ = {0}; - guint64 _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; -#line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_table_get_instance (); + if (_tmp4_ != _tmp5_) { +#line 17136 "Photo.c" + PhotoTable* _tmp6_; + PhotoTable* _tmp7_; + PhotoID _tmp8_ = {0}; + guint64 _tmp9_; + gboolean _tmp10_; #line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp6_ = photo_table_get_instance (); #line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp10_); + _tmp7_ = _tmp6_; #line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = flags; + photo_get_photo_id (self, &_tmp8_); #line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_); + _tmp9_ = flags; #line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp12_; + committed = photo_table_replace_flags (_tmp7_, &_tmp8_, _tmp9_); #line 2120 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp9_); + _database_table_unref0 (_tmp7_); #line 2121 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = committed; + _tmp10_ = committed; #line 2121 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_) { -#line 16568 "Photo.c" - PhotoRow* _tmp14_; - guint64 _tmp15_; + if (_tmp10_) { +#line 17158 "Photo.c" + PhotoRow* _tmp11_; + guint64 _tmp12_; #line 2122 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp11_ = self->row; #line 2122 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = flags; + _tmp12_ = flags; #line 2122 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_->flags = _tmp15_; -#line 16577 "Photo.c" + _tmp11_->flags = _tmp12_; +#line 17167 "Photo.c" } } } __finally343: { - PhotoRow* _tmp16_; + PhotoRow* _tmp13_; #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->row; + _tmp13_ = self->row; #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16588 "Photo.c" +#line 17178 "Photo.c" } #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16592 "Photo.c" - guint64 _tmp17_ = 0ULL; +#line 17182 "Photo.c" + guint64 _tmp14_ = 0ULL; #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2117 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp17_; -#line 16600 "Photo.c" + return _tmp14_; +#line 17190 "Photo.c" } } #line 2126 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = committed; + _tmp15_ = committed; #line 2126 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_) { -#line 16607 "Photo.c" - Alteration* _tmp19_; -#line 2127 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = additional_alteration; + if (_tmp15_) { #line 2127 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp19_); -#line 16613 "Photo.c" + photo_notify_flags_altered (self, additional_alteration); +#line 17199 "Photo.c" } #line 2129 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; #line 2129 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16619 "Photo.c" +#line 17205 "Photo.c" } -void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alteration* additional_add_alteration, GeeCollection* remove, guint64 remove_mask, Alteration* additional_remove_alteration, GError** error) { - GeeCollection* _tmp0_; - GeeCollection* _tmp10_; +void +photo_add_remove_many_flags (GeeCollection* add, + guint64 add_mask, + Alteration* additional_add_alteration, + GeeCollection* remove, + guint64 remove_mask, + Alteration* additional_remove_alteration, + GError** error) +{ GError * _inner_error_ = NULL; #line 2132 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((add == NULL) || GEE_IS_COLLECTION (add)); @@ -16636,121 +17228,93 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati #line 2135 "/home/jens/Source/shotwell/src/Photo.vala" database_table_begin_transaction (); #line 2137 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = add; -#line 2137 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != NULL) { -#line 16641 "Photo.c" + if (add != NULL) { +#line 17231 "Photo.c" { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = add; + GeeIterator* _tmp0_; #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (add, GEE_TYPE_ITERABLE, GeeIterable)); #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_it = _tmp2_; + _photo_it = _tmp0_; #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 16654 "Photo.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 17241 "Photo.c" + GeeIterator* _tmp1_; Photo* photo = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - Photo* _tmp7_; - guint64 _tmp8_; - Alteration* _tmp9_; -#line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _photo_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + Photo* _tmp4_; #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp1_ = _photo_it; #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 16671 "Photo.c" +#line 17253 "Photo.c" } #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _photo_it; + _tmp2_ = _photo_it; #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" - photo = (Photo*) _tmp6_; + photo = (Photo*) _tmp3_; #line 2139 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo; + _tmp4_ = photo; #line 2139 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = add_mask; -#line 2139 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = additional_add_alteration; -#line 2139 "/home/jens/Source/shotwell/src/Photo.vala" - photo_add_flags (_tmp7_, _tmp8_, _tmp9_); + photo_add_flags (_tmp4_, add_mask, additional_add_alteration); #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 16689 "Photo.c" +#line 17267 "Photo.c" } #line 2138 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 16693 "Photo.c" +#line 17271 "Photo.c" } } #line 2142 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = remove; -#line 2142 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_ != NULL) { -#line 16700 "Photo.c" + if (remove != NULL) { +#line 17276 "Photo.c" { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp11_; - GeeIterator* _tmp12_; -#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = remove; + GeeIterator* _tmp5_; #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (remove, GEE_TYPE_ITERABLE, GeeIterable)); #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_it = _tmp12_; + _photo_it = _tmp5_; #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 16713 "Photo.c" - GeeIterator* _tmp13_; - gboolean _tmp14_; +#line 17286 "Photo.c" + GeeIterator* _tmp6_; Photo* photo = NULL; - GeeIterator* _tmp15_; - gpointer _tmp16_; - Photo* _tmp17_; - guint64 _tmp18_; - Alteration* _tmp19_; -#line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _photo_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + Photo* _tmp9_; #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = gee_iterator_next (_tmp13_); + _tmp6_ = _photo_it; #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp14_) { + if (!gee_iterator_next (_tmp6_)) { #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 16730 "Photo.c" +#line 17298 "Photo.c" } #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _photo_it; + _tmp7_ = _photo_it; #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = gee_iterator_get (_tmp15_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" - photo = (Photo*) _tmp16_; -#line 2144 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo; + photo = (Photo*) _tmp8_; #line 2144 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = remove_mask; -#line 2144 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = additional_remove_alteration; + _tmp9_ = photo; #line 2144 "/home/jens/Source/shotwell/src/Photo.vala" - photo_remove_flags (_tmp17_, _tmp18_, _tmp19_); + photo_remove_flags (_tmp9_, remove_mask, additional_remove_alteration); #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 16748 "Photo.c" +#line 17312 "Photo.c" } #line 2143 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 16752 "Photo.c" +#line 17316 "Photo.c" } } #line 2147 "/home/jens/Source/shotwell/src/Photo.vala" @@ -16763,7 +17327,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati g_propagate_error (error, _inner_error_); #line 2147 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16765 "Photo.c" +#line 17329 "Photo.c" } else { #line 2147 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -16771,17 +17335,21 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati g_clear_error (&_inner_error_); #line 2147 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 16773 "Photo.c" +#line 17337 "Photo.c" } } } -guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_alteration) { +guint64 +photo_toggle_flags (Photo* self, + guint64 mask, + Alteration* additional_alteration) +{ guint64 result = 0ULL; guint64 flags = 0ULL; gboolean committed = FALSE; - gboolean _tmp17_; + gboolean _tmp15_; GError * _inner_error_ = NULL; #line 2150 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); @@ -16791,123 +17359,115 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al flags = (guint64) 0; #line 2153 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16793 "Photo.c" +#line 17361 "Photo.c" { PhotoRow* _tmp0_; #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16800 "Photo.c" +#line 17368 "Photo.c" { PhotoRow* _tmp1_; guint64 _tmp2_; - guint64 _tmp3_; - PhotoRow* _tmp4_; + PhotoRow* _tmp3_; + guint64 _tmp4_; guint64 _tmp5_; - guint64 _tmp6_; #line 2155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2155 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->flags; #line 2155 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = mask; -#line 2155 "/home/jens/Source/shotwell/src/Photo.vala" - flags = _tmp2_ ^ _tmp3_; + flags = _tmp2_ ^ mask; #line 2156 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 2156 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->flags; + _tmp4_ = _tmp3_->flags; #line 2156 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = flags; + _tmp5_ = flags; #line 2156 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_ != _tmp6_) { -#line 16824 "Photo.c" + if (_tmp4_ != _tmp5_) { +#line 17389 "Photo.c" + PhotoTable* _tmp6_; PhotoTable* _tmp7_; - PhotoTable* _tmp8_; - PhotoID _tmp9_ = {0}; - guint64 _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; -#line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_table_get_instance (); + PhotoID _tmp8_ = {0}; + guint64 _tmp9_; + gboolean _tmp10_; #line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _tmp6_ = photo_table_get_instance (); #line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp9_); + _tmp7_ = _tmp6_; #line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = flags; + photo_get_photo_id (self, &_tmp8_); #line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_table_replace_flags (_tmp8_, &_tmp9_, _tmp10_); + _tmp9_ = flags; #line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp11_; + committed = photo_table_replace_flags (_tmp7_, &_tmp8_, _tmp9_); #line 2157 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp8_); + _database_table_unref0 (_tmp7_); #line 2158 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = committed; + _tmp10_ = committed; #line 2158 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { -#line 16849 "Photo.c" - PhotoRow* _tmp13_; - guint64 _tmp14_; + if (_tmp10_) { +#line 17411 "Photo.c" + PhotoRow* _tmp11_; + guint64 _tmp12_; #line 2159 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->row; + _tmp11_ = self->row; #line 2159 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = flags; + _tmp12_ = flags; #line 2159 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_->flags = _tmp14_; -#line 16858 "Photo.c" + _tmp11_->flags = _tmp12_; +#line 17420 "Photo.c" } } } __finally344: { - PhotoRow* _tmp15_; + PhotoRow* _tmp13_; #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = self->row; + _tmp13_ = self->row; #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16869 "Photo.c" +#line 17431 "Photo.c" } #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16873 "Photo.c" - guint64 _tmp16_ = 0ULL; +#line 17435 "Photo.c" + guint64 _tmp14_ = 0ULL; #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2154 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp16_; -#line 16881 "Photo.c" + return _tmp14_; +#line 17443 "Photo.c" } } #line 2163 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = committed; + _tmp15_ = committed; #line 2163 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_) { -#line 16888 "Photo.c" - Alteration* _tmp18_; -#line 2164 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = additional_alteration; + if (_tmp15_) { #line 2164 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_flags_altered (self, _tmp18_); -#line 16894 "Photo.c" + photo_notify_flags_altered (self, additional_alteration); +#line 17452 "Photo.c" } #line 2166 "/home/jens/Source/shotwell/src/Photo.vala" result = flags; #line 2166 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16900 "Photo.c" +#line 17458 "Photo.c" } -gboolean photo_is_master_metadata_dirty (Photo* self) { +gboolean +photo_is_master_metadata_dirty (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 2169 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 16909 "Photo.c" +#line 17469 "Photo.c" { PhotoRow* _tmp0_; gboolean _tmp5_ = FALSE; @@ -16915,7 +17475,7 @@ gboolean photo_is_master_metadata_dirty (Photo* self) { _tmp0_ = self->row; #line 2170 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16917 "Photo.c" +#line 17477 "Photo.c" { PhotoRow* _tmp1_; gboolean _tmp2_; @@ -16925,18 +17485,18 @@ gboolean photo_is_master_metadata_dirty (Photo* self) { _tmp2_ = _tmp1_->metadata_dirty; #line 2171 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 16927 "Photo.c" +#line 17487 "Photo.c" { PhotoRow* _tmp3_; #line 2170 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2170 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16934 "Photo.c" +#line 17494 "Photo.c" } #line 2171 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 16938 "Photo.c" +#line 17498 "Photo.c" } __finally345: { @@ -16945,7 +17505,7 @@ gboolean photo_is_master_metadata_dirty (Photo* self) { _tmp4_ = self->row; #line 2170 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 16947 "Photo.c" +#line 17507 "Photo.c" } #line 2170 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -16953,82 +17513,77 @@ gboolean photo_is_master_metadata_dirty (Photo* self) { g_clear_error (&_inner_error_); #line 2170 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 16955 "Photo.c" +#line 17515 "Photo.c" } } -void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** error) { +void +photo_set_master_metadata_dirty (Photo* self, + gboolean dirty, + GError** error) +{ gboolean committed = FALSE; - gboolean _tmp11_; + gboolean _tmp8_; GError * _inner_error_ = NULL; #line 2175 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2176 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 16968 "Photo.c" +#line 17532 "Photo.c" { PhotoRow* _tmp0_; #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 16975 "Photo.c" +#line 17539 "Photo.c" { PhotoRow* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 2178 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2178 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->metadata_dirty; #line 2178 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = dirty; -#line 2178 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ != _tmp3_) { -#line 16988 "Photo.c" + if (_tmp2_ != dirty) { +#line 17549 "Photo.c" + PhotoTable* _tmp3_; PhotoTable* _tmp4_; - PhotoTable* _tmp5_; - PhotoID _tmp6_ = {0}; - gboolean _tmp7_; - PhotoRow* _tmp8_; - gboolean _tmp9_; + PhotoID _tmp5_ = {0}; + PhotoRow* _tmp6_; #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_table_get_instance (); + _tmp3_ = photo_table_get_instance (); #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp6_); -#line 2179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = dirty; + photo_get_photo_id (self, &_tmp5_); #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_set_metadata_dirty (_tmp5_, &_tmp6_, _tmp7_, &_inner_error_); + photo_table_set_metadata_dirty (_tmp4_, &_tmp5_, dirty, &_inner_error_); #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp5_); + _database_table_unref0 (_tmp4_); #line 2179 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17009 "Photo.c" +#line 17566 "Photo.c" goto __finally346; } #line 2180 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->row; -#line 2180 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = dirty; + _tmp6_ = self->row; #line 2180 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_->metadata_dirty = _tmp9_; + _tmp6_->metadata_dirty = dirty; #line 2181 "/home/jens/Source/shotwell/src/Photo.vala" committed = TRUE; -#line 17020 "Photo.c" +#line 17575 "Photo.c" } } __finally346: { - PhotoRow* _tmp10_; + PhotoRow* _tmp7_; #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->row; + _tmp7_ = self->row; #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17030 "Photo.c" +#line 17585 "Photo.c" } #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -17038,7 +17593,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro g_propagate_error (error, _inner_error_); #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17040 "Photo.c" +#line 17595 "Photo.c" } else { #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -17046,44 +17601,46 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro g_clear_error (&_inner_error_); #line 2177 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17048 "Photo.c" +#line 17603 "Photo.c" } } } #line 2185 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = committed; + _tmp8_ = committed; #line 2185 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 17056 "Photo.c" - Alteration* _tmp12_; - Alteration* _tmp13_; + if (_tmp8_) { +#line 17611 "Photo.c" + Alteration* _tmp9_; + Alteration* _tmp10_; #line 2186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = alteration_new ("metadata", "master-dirty"); + _tmp9_ = alteration_new ("metadata", "master-dirty"); #line 2186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 2186 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp10_); #line 2186 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp13_); -#line 17067 "Photo.c" + _alteration_unref0 (_tmp10_); +#line 17622 "Photo.c" } } -static Rating photo_real_get_rating (MediaSource* base) { +static Rating +photo_real_get_rating (MediaSource* base) +{ Photo * self; Rating result = 0; GError * _inner_error_ = NULL; #line 2189 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17078 "Photo.c" +#line 17635 "Photo.c" { PhotoRow* _tmp0_; #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17085 "Photo.c" +#line 17642 "Photo.c" { PhotoRow* _tmp1_; Rating _tmp2_; @@ -17093,18 +17650,18 @@ static Rating photo_real_get_rating (MediaSource* base) { _tmp2_ = _tmp1_->rating; #line 2191 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 17095 "Photo.c" +#line 17652 "Photo.c" { PhotoRow* _tmp3_; #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17102 "Photo.c" +#line 17659 "Photo.c" } #line 2191 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17106 "Photo.c" +#line 17663 "Photo.c" } __finally347: { @@ -17113,7 +17670,7 @@ static Rating photo_real_get_rating (MediaSource* base) { _tmp4_ = self->row; #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17115 "Photo.c" +#line 17672 "Photo.c" } #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -17121,104 +17678,88 @@ static Rating photo_real_get_rating (MediaSource* base) { g_clear_error (&_inner_error_); #line 2190 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 17123 "Photo.c" +#line 17680 "Photo.c" } } -static void photo_real_set_rating (MediaSource* base, Rating rating) { +static void +photo_real_set_rating (MediaSource* base, + Rating rating) +{ Photo * self; gboolean committed = FALSE; - gboolean _tmp16_; + gboolean _tmp10_; GError * _inner_error_ = NULL; #line 2195 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2196 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 17137 "Photo.c" +#line 17697 "Photo.c" { PhotoRow* _tmp0_; #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17144 "Photo.c" +#line 17704 "Photo.c" { gboolean _tmp1_ = FALSE; - Rating _tmp2_; - PhotoRow* _tmp3_; - Rating _tmp4_; -#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = rating; -#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->row; -#line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_->rating; + PhotoRow* _tmp2_; + Rating _tmp3_; #line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ != _tmp4_) { -#line 17158 "Photo.c" - Rating _tmp5_; - gboolean _tmp6_; + _tmp2_ = self->row; #line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = rating; + _tmp3_ = _tmp2_->rating; #line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = rating_is_valid (_tmp5_); + if (rating != _tmp3_) { #line 2199 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp6_; -#line 17167 "Photo.c" + _tmp1_ = rating_is_valid (rating); +#line 17717 "Photo.c" } else { #line 2199 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 17171 "Photo.c" +#line 17721 "Photo.c" } #line 2199 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 17175 "Photo.c" - PhotoTable* _tmp7_; - PhotoTable* _tmp8_; - PhotoID _tmp9_ = {0}; - Rating _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; -#line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_table_get_instance (); -#line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; +#line 17725 "Photo.c" + PhotoTable* _tmp4_; + PhotoTable* _tmp5_; + PhotoID _tmp6_ = {0}; + gboolean _tmp7_; #line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp9_); + _tmp4_ = photo_table_get_instance (); #line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = rating; + _tmp5_ = _tmp4_; #line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_table_set_rating (_tmp8_, &_tmp9_, _tmp10_); + photo_get_photo_id (self, &_tmp6_); #line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp11_; + committed = photo_table_set_rating (_tmp5_, &_tmp6_, rating); #line 2200 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp8_); + _database_table_unref0 (_tmp5_); #line 2201 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = committed; + _tmp7_ = committed; #line 2201 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { -#line 17200 "Photo.c" - PhotoRow* _tmp13_; - Rating _tmp14_; -#line 2202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->row; + if (_tmp7_) { +#line 17744 "Photo.c" + PhotoRow* _tmp8_; #line 2202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = rating; + _tmp8_ = self->row; #line 2202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_->rating = _tmp14_; -#line 17209 "Photo.c" + _tmp8_->rating = rating; +#line 17750 "Photo.c" } } } __finally348: { - PhotoRow* _tmp15_; + PhotoRow* _tmp9_; #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = self->row; + _tmp9_ = self->row; #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17220 "Photo.c" +#line 17761 "Photo.c" } #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -17228,64 +17769,63 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) { g_clear_error (&_inner_error_); #line 2198 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17230 "Photo.c" +#line 17771 "Photo.c" } } #line 2206 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = committed; + _tmp10_ = committed; #line 2206 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp16_) { -#line 17237 "Photo.c" - Alteration* _tmp17_; - Alteration* _tmp18_; + if (_tmp10_) { +#line 17778 "Photo.c" + Alteration* _tmp11_; + Alteration* _tmp12_; #line 2207 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = alteration_new ("metadata", "rating"); + _tmp11_ = alteration_new ("metadata", "rating"); #line 2207 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_; + _tmp12_ = _tmp11_; #line 2207 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp12_); #line 2207 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp18_); -#line 17248 "Photo.c" + _alteration_unref0 (_tmp12_); +#line 17789 "Photo.c" } } -static void photo_real_increase_rating (MediaSource* base) { +static void +photo_real_increase_rating (MediaSource* base) +{ Photo * self; GError * _inner_error_ = NULL; #line 2210 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17258 "Photo.c" +#line 17801 "Photo.c" { PhotoRow* _tmp0_; #line 2211 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2211 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17265 "Photo.c" +#line 17808 "Photo.c" { PhotoRow* _tmp1_; Rating _tmp2_; - Rating _tmp3_; #line 2212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->rating; #line 2212 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = rating_increase (_tmp2_); -#line 2212 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_); -#line 17278 "Photo.c" + media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), rating_increase (_tmp2_)); +#line 17818 "Photo.c" } __finally349: { - PhotoRow* _tmp4_; + PhotoRow* _tmp3_; #line 2211 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 2211 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17287 "Photo.c" +#line 17827 "Photo.c" } #line 2211 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -17295,47 +17835,46 @@ static void photo_real_increase_rating (MediaSource* base) { g_clear_error (&_inner_error_); #line 2211 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17297 "Photo.c" +#line 17837 "Photo.c" } } } -static void photo_real_decrease_rating (MediaSource* base) { +static void +photo_real_decrease_rating (MediaSource* base) +{ Photo * self; GError * _inner_error_ = NULL; #line 2216 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 17308 "Photo.c" +#line 17850 "Photo.c" { PhotoRow* _tmp0_; #line 2217 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2217 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17315 "Photo.c" +#line 17857 "Photo.c" { PhotoRow* _tmp1_; Rating _tmp2_; - Rating _tmp3_; #line 2218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2218 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->rating; #line 2218 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = rating_decrease (_tmp2_); -#line 2218 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_); -#line 17328 "Photo.c" + media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), rating_decrease (_tmp2_)); +#line 17867 "Photo.c" } __finally350: { - PhotoRow* _tmp4_; + PhotoRow* _tmp3_; #line 2217 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 2217 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17337 "Photo.c" +#line 17876 "Photo.c" } #line 2217 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -17345,25 +17884,28 @@ static void photo_real_decrease_rating (MediaSource* base) { g_clear_error (&_inner_error_); #line 2217 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17347 "Photo.c" +#line 17886 "Photo.c" } } } -static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks) { +static void +photo_real_commit_backlinks (DataSource* base, + SourceCollection* sources, + const gchar* backlinks) +{ Photo * self; GError * _inner_error_ = NULL; #line 2222 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2222 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources)); -#line 17360 "Photo.c" +#line 17903 "Photo.c" { PhotoTable* _tmp0_; PhotoTable* _tmp1_; PhotoID _tmp2_ = {0}; - const gchar* _tmp3_; #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17371,16 +17913,14 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" photo_get_photo_id (self, &_tmp2_); #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = backlinks; -#line 2227 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_); + photo_table_update_backlinks (_tmp1_, &_tmp2_, backlinks, &_inner_error_); #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 17382 "Photo.c" +#line 17922 "Photo.c" goto __catch351_database_error; } #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17389,45 +17929,42 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou g_clear_error (&_inner_error_); #line 2227 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17391 "Photo.c" +#line 17931 "Photo.c" } { - PhotoRow* _tmp4_; + PhotoRow* _tmp3_; #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17399 "Photo.c" +#line 17939 "Photo.c" { - PhotoRow* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; -#line 2229 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + PhotoRow* _tmp4_; + gchar* _tmp5_; #line 2229 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = backlinks; + _tmp4_ = self->row; #line 2229 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp5_ = g_strdup (backlinks); #line 2229 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp5_->backlinks); + _g_free0 (_tmp4_->backlinks); #line 2229 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_->backlinks = _tmp7_; -#line 17414 "Photo.c" + _tmp4_->backlinks = _tmp5_; +#line 17951 "Photo.c" } __finally352: { - PhotoRow* _tmp8_; + PhotoRow* _tmp6_; #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->row; + _tmp6_ = self->row; #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17423 "Photo.c" +#line 17960 "Photo.c" } #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 17429 "Photo.c" +#line 17966 "Photo.c" goto __catch351_database_error; } #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17436,7 +17973,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou g_clear_error (&_inner_error_); #line 2228 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17438 "Photo.c" +#line 17975 "Photo.c" } } } @@ -17444,29 +17981,29 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou __catch351_database_error: { GError* err = NULL; - gchar* _tmp9_; - gchar* _tmp10_; - GError* _tmp11_; - const gchar* _tmp12_; + gchar* _tmp7_; + gchar* _tmp8_; + GError* _tmp9_; + const gchar* _tmp10_; #line 2226 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 2226 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 2232 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp7_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 2232 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 2232 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = err; + _tmp9_ = err; #line 2232 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_->message; + _tmp10_ = _tmp9_->message; #line 2232 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2232: Unable to update link state for %s: %s", _tmp10_, _tmp12_); + g_warning ("Photo.vala:2232: Unable to update link state for %s: %s", _tmp8_, _tmp10_); #line 2232 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp8_); #line 2226 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17468 "Photo.c" +#line 18005 "Photo.c" } __finally351: #line 2226 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17477,12 +18014,15 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou g_clear_error (&_inner_error_); #line 2226 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17479 "Photo.c" +#line 18016 "Photo.c" } } -static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { +static gboolean +photo_real_set_event_id (MediaSource* base, + EventID* event_id) +{ Photo * self; gboolean result = FALSE; GError * _inner_error_ = NULL; @@ -17490,15 +18030,15 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2240 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (event_id != NULL, FALSE); -#line 17492 "Photo.c" +#line 18032 "Photo.c" { PhotoRow* _tmp0_; - gboolean _tmp13_ = FALSE; + gboolean _tmp12_ = FALSE; #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17500 "Photo.c" +#line 18040 "Photo.c" { gboolean committed = FALSE; PhotoTable* _tmp1_; @@ -17508,7 +18048,6 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { EventID _tmp5_; gboolean _tmp6_; gboolean _tmp7_; - gboolean _tmp8_; #line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); #line 2242 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17522,256 +18061,249 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) { #line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = photo_table_set_event (_tmp2_, &_tmp4_, &_tmp5_); #line 2242 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; -#line 2242 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); #line 2242 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp7_; + committed = _tmp6_; #line 2244 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = committed; + _tmp7_ = committed; #line 2244 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { -#line 17533 "Photo.c" - PhotoRow* _tmp9_; - EventID _tmp10_; + if (_tmp7_) { +#line 18070 "Photo.c" + PhotoRow* _tmp8_; + EventID _tmp9_; #line 2245 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = self->row; + _tmp8_ = self->row; #line 2245 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = *event_id; + _tmp9_ = *event_id; #line 2245 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_->event_id = _tmp10_; -#line 17542 "Photo.c" + _tmp8_->event_id = _tmp9_; +#line 18079 "Photo.c" } #line 2247 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; -#line 17546 "Photo.c" +#line 18083 "Photo.c" { - PhotoRow* _tmp11_; + PhotoRow* _tmp10_; #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + _tmp10_ = self->row; #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17553 "Photo.c" +#line 18090 "Photo.c" } #line 2247 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17557 "Photo.c" +#line 18094 "Photo.c" } __finally353: { - PhotoRow* _tmp12_; + PhotoRow* _tmp11_; #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = self->row; + _tmp11_ = self->row; #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 17566 "Photo.c" +#line 18103 "Photo.c" } #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2241 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp13_; -#line 17574 "Photo.c" + return _tmp12_; +#line 18111 "Photo.c" } } -static gchar* photo_real_to_string (DataObject* base) { +static gchar* +photo_real_to_string (DataObject* base) +{ Photo * self; gchar* result = NULL; gchar* _tmp0_ = NULL; - gboolean _tmp1_; - PhotoID _tmp10_ = {0}; - gint64 _tmp11_; + PhotoID _tmp9_ = {0}; + gint64 _tmp10_; + gchar* _tmp11_; gchar* _tmp12_; - gchar* _tmp13_; + PhotoFileReader* _tmp13_; PhotoFileReader* _tmp14_; - PhotoFileReader* _tmp15_; + gchar* _tmp15_; gchar* _tmp16_; gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; #line 2251 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_is_master_baseline (self); -#line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp1_) { -#line 17600 "Photo.c" + if (!photo_is_master_baseline (self)) { +#line 18136 "Photo.c" + GFile* _tmp1_; GFile* _tmp2_; - GFile* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; - gchar* _tmp8_; #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_get_actual_file (self); + _tmp1_ = photo_get_actual_file (self); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = g_file_get_path (_tmp3_); + _tmp3_ = g_file_get_path (_tmp2_); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = g_strconcat (" (", _tmp5_, NULL); + _tmp5_ = g_strconcat (" (", _tmp4_, NULL); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_strconcat (_tmp7_, ")", NULL); + _tmp7_ = g_strconcat (_tmp6_, ")", NULL); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp8_; + _tmp0_ = _tmp7_; #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); -#line 17632 "Photo.c" + _g_object_unref0 (_tmp2_); +#line 18168 "Photo.c" } else { - gchar* _tmp9_; + gchar* _tmp8_; #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = g_strdup (""); + _tmp8_ = g_strdup (""); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 2253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp9_; -#line 17641 "Photo.c" + _tmp0_ = _tmp8_; +#line 18177 "Photo.c" } #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp10_); + photo_get_photo_id (self, &_tmp9_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_.id; + _tmp10_ = _tmp9_.id; #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp11_); + _tmp11_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp10_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo_get_master_reader (self); + _tmp13_ = photo_get_master_reader (self); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp15_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = g_strdup_printf ("[%s] %s%s", _tmp13_, _tmp17_, _tmp0_); + _tmp17_ = g_strdup_printf ("[%s] %s%s", _tmp12_, _tmp16_, _tmp0_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp16_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp15_); + _photo_file_adapter_unref0 (_tmp14_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp12_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp19_; + result = _tmp18_; #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 2252 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17675 "Photo.c" +#line 18211 "Photo.c" } -static gboolean photo_real_equals (DataSource* base, DataSource* source) { +static gboolean +photo_real_equals (DataSource* base, + DataSource* source) +{ Photo * self; gboolean result = FALSE; Photo* photo = NULL; - DataSource* _tmp0_; + Photo* _tmp0_; Photo* _tmp1_; - Photo* _tmp2_; - DataSource* _tmp14_; - gboolean _tmp15_; #line 2256 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2256 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE); #line 2258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = source; -#line 2258 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO) ? ((Photo*) _tmp0_) : NULL); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO) ? ((Photo*) source) : NULL); #line 2258 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp1_; + photo = _tmp0_; #line 2259 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo; + _tmp1_ = photo; #line 2259 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ != NULL) { -#line 17702 "Photo.c" + if (_tmp1_ != NULL) { +#line 18236 "Photo.c" PhotoID photo_id = {0}; - PhotoID _tmp3_ = {0}; + PhotoID _tmp2_ = {0}; PhotoID other_photo_id = {0}; - Photo* _tmp4_; - PhotoID _tmp5_ = {0}; - gboolean _tmp6_ = FALSE; - Photo* _tmp7_; + Photo* _tmp3_; + PhotoID _tmp4_ = {0}; + gboolean _tmp5_ = FALSE; + Photo* _tmp6_; #line 2260 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp3_); + photo_get_photo_id (self, &_tmp2_); #line 2260 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id = _tmp3_; + photo_id = _tmp2_; #line 2261 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo; + _tmp3_ = photo; #line 2261 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (_tmp4_, &_tmp5_); + photo_get_photo_id (_tmp3_, &_tmp4_); #line 2261 "/home/jens/Source/shotwell/src/Photo.vala" - other_photo_id = _tmp5_; + other_photo_id = _tmp4_; #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo; + _tmp6_ = photo; #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - if (self != _tmp7_) { -#line 17724 "Photo.c" - PhotoID _tmp8_; - gint64 _tmp9_; + if (self != _tmp6_) { +#line 18258 "Photo.c" + PhotoID _tmp7_; + gint64 _tmp8_; #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_id; + _tmp7_ = photo_id; #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_.id; + _tmp8_ = _tmp7_.id; #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp9_ != PHOTO_ID_INVALID; -#line 17733 "Photo.c" + _tmp5_ = _tmp8_ != PHOTO_ID_INVALID; +#line 18267 "Photo.c" } else { #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = FALSE; -#line 17737 "Photo.c" + _tmp5_ = FALSE; +#line 18271 "Photo.c" } #line 2263 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { -#line 17741 "Photo.c" - PhotoID _tmp10_; - gint64 _tmp11_; - PhotoID _tmp12_; - gint64 _tmp13_; + if (_tmp5_) { +#line 18275 "Photo.c" + PhotoID _tmp9_; + gint64 _tmp10_; + PhotoID _tmp11_; + gint64 _tmp12_; #line 2264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_id; + _tmp9_ = photo_id; #line 2264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_.id; + _tmp10_ = _tmp9_.id; #line 2264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = other_photo_id; + _tmp11_ = other_photo_id; #line 2264 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_.id; + _tmp12_ = _tmp11_.id; #line 2264 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp11_ != _tmp13_, "photo_id.id != other_photo_id.id"); -#line 17756 "Photo.c" + _vala_assert (_tmp10_ != _tmp12_, "photo_id.id != other_photo_id.id"); +#line 18290 "Photo.c" } } #line 2268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = source; -#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = DATA_SOURCE_CLASS (photo_parent_class)->equals (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), _tmp14_); -#line 2268 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp15_; + result = 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), source); #line 2268 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 2268 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 17769 "Photo.c" +#line 18299 "Photo.c" } -static void photo_file_exif_updated (Photo* self) { +static void +photo_file_exif_updated (Photo* self) +{ GFile* file = NULL; GFile* _tmp0_; GFileInfo* info = NULL; @@ -17785,7 +18317,7 @@ static void photo_file_exif_updated (Photo* self) { gboolean _tmp15_ = FALSE; DetectedPhotoInformation* _tmp16_; gboolean success = FALSE; - gboolean _tmp37_; + gboolean _tmp34_; GError * _inner_error_ = NULL; #line 2272 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -17795,7 +18327,7 @@ static void photo_file_exif_updated (Photo* self) { file = _tmp0_; #line 2275 "/home/jens/Source/shotwell/src/Photo.vala" info = NULL; -#line 17797 "Photo.c" +#line 18329 "Photo.c" { GFileInfo* _tmp1_ = NULL; GFileInfo* _tmp2_; @@ -17806,7 +18338,7 @@ static void photo_file_exif_updated (Photo* self) { _tmp1_ = _tmp2_; #line 2277 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17808 "Photo.c" +#line 18340 "Photo.c" goto __catch354_g_error; } #line 2277 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17819,7 +18351,7 @@ static void photo_file_exif_updated (Photo* self) { info = _tmp3_; #line 2276 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); -#line 17821 "Photo.c" +#line 18353 "Photo.c" } goto __finally354; __catch354_g_error: @@ -17844,7 +18376,7 @@ static void photo_file_exif_updated (Photo* self) { _g_free0 (_tmp5_); #line 2276 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17846 "Photo.c" +#line 18378 "Photo.c" } __finally354: #line 2276 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17859,7 +18391,7 @@ static void photo_file_exif_updated (Photo* self) { g_clear_error (&_inner_error_); #line 2276 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17861 "Photo.c" +#line 18393 "Photo.c" } #line 2283 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = info; @@ -17871,13 +18403,13 @@ static void photo_file_exif_updated (Photo* self) { _tmp9_ = photo_file_interrogator_new (file, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL); #line 2286 "/home/jens/Source/shotwell/src/Photo.vala" interrogator = _tmp9_; -#line 17873 "Photo.c" +#line 18405 "Photo.c" { #line 2288 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_interrogator_interrogate (interrogator, &_inner_error_); #line 2288 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17879 "Photo.c" +#line 18411 "Photo.c" goto __catch355_g_error; } } @@ -17907,7 +18439,7 @@ static void photo_file_exif_updated (Photo* self) { _g_free0 (_tmp11_); #line 2287 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 17909 "Photo.c" +#line 18441 "Photo.c" } __finally355: #line 2287 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17924,7 +18456,7 @@ static void photo_file_exif_updated (Photo* self) { g_clear_error (&_inner_error_); #line 2287 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17926 "Photo.c" +#line 18458 "Photo.c" } #line 2293 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = photo_file_interrogator_get_detected_photo_information (interrogator); @@ -17936,28 +18468,25 @@ static void photo_file_exif_updated (Photo* self) { if (_tmp16_ == NULL) { #line 2294 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = TRUE; -#line 17938 "Photo.c" +#line 18470 "Photo.c" } else { - gboolean _tmp17_; -#line 2294 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_file_interrogator_get_is_photo_corrupted (interrogator); #line 2294 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp17_; -#line 17945 "Photo.c" + _tmp15_ = photo_file_interrogator_get_is_photo_corrupted (interrogator); +#line 18474 "Photo.c" } #line 2294 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp15_) { -#line 17949 "Photo.c" +#line 18478 "Photo.c" + gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; #line 2295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 2295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 2295 "/home/jens/Source/shotwell/src/Photo.vala" - g_critical ("Photo.vala:2295: file_exif_updated: %s no longer an image", _tmp19_); + g_critical ("Photo.vala:2295: file_exif_updated: %s no longer an image", _tmp18_); #line 2295 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp18_); #line 2297 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); #line 2297 "/home/jens/Source/shotwell/src/Photo.vala" @@ -17968,75 +18497,69 @@ static void photo_file_exif_updated (Photo* self) { _g_object_unref0 (file); #line 2297 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 17970 "Photo.c" +#line 18499 "Photo.c" } { - PhotoRow* _tmp20_; + PhotoRow* _tmp19_; #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->row; + _tmp19_ = self->row; #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 17978 "Photo.c" +#line 18507 "Photo.c" { + PhotoTable* _tmp20_; PhotoTable* _tmp21_; - PhotoTable* _tmp22_; - PhotoID _tmp23_ = {0}; - GFileInfo* _tmp24_; - gint64 _tmp25_; - GTimeVal _tmp26_; - glong _tmp27_; + PhotoID _tmp22_ = {0}; + GFileInfo* _tmp23_; + GTimeVal _tmp24_; + glong _tmp25_; + DetectedPhotoInformation* _tmp26_; + const gchar* _tmp27_; DetectedPhotoInformation* _tmp28_; const gchar* _tmp29_; DetectedPhotoInformation* _tmp30_; const gchar* _tmp31_; - DetectedPhotoInformation* _tmp32_; - const gchar* _tmp33_; - PhotoRow* _tmp34_; - gboolean _tmp35_; + PhotoRow* _tmp32_; +#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp20_ = photo_table_get_instance (); #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_table_get_instance (); + _tmp21_ = _tmp20_; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_; + photo_get_photo_id (self, &_tmp22_); #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (self, &_tmp23_); + _tmp23_ = info; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = info; + _tmp24_ = timestamp; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = g_file_info_get_size (_tmp24_); + _tmp25_ = _tmp24_.tv_sec; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = timestamp; + _tmp26_ = detected; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_.tv_sec; + _tmp27_ = _tmp26_->md5; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = detected; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_->md5; + _tmp29_ = _tmp28_->exif_md5; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = detected; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp30_->exif_md5; + _tmp31_ = _tmp30_->thumbnail_md5; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = detected; -#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_->thumbnail_md5; -#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = self->row; -#line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo_table_master_exif_updated (_tmp22_, &_tmp23_, _tmp25_, _tmp27_, _tmp29_, _tmp31_, _tmp33_, _tmp34_); + _tmp32_ = self->row; #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - success = _tmp35_; + success = photo_table_master_exif_updated (_tmp21_, &_tmp22_, g_file_info_get_size (_tmp23_), _tmp25_, _tmp27_, _tmp29_, _tmp31_, _tmp32_); #line 2302 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp22_); -#line 18029 "Photo.c" + _database_table_unref0 (_tmp21_); +#line 18552 "Photo.c" } __finally356: { - PhotoRow* _tmp36_; + PhotoRow* _tmp33_; #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = self->row; + _tmp33_ = self->row; #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18038 "Photo.c" +#line 18561 "Photo.c" } #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -18054,25 +18577,25 @@ static void photo_file_exif_updated (Photo* self) { g_clear_error (&_inner_error_); #line 2301 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18056 "Photo.c" +#line 18579 "Photo.c" } } #line 2306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = success; + _tmp34_ = success; #line 2306 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp37_) { -#line 18063 "Photo.c" - Alteration* _tmp38_; - Alteration* _tmp39_; + if (_tmp34_) { +#line 18586 "Photo.c" + Alteration* _tmp35_; + Alteration* _tmp36_; #line 2307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = alteration_new_from_list ("metadata:exif,metadata:md5"); + _tmp35_ = alteration_new_from_list ("metadata:exif,metadata:md5"); #line 2307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tmp38_; + _tmp36_ = _tmp35_; #line 2307 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp36_); #line 2307 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp39_); -#line 18074 "Photo.c" + _alteration_unref0 (_tmp36_); +#line 18597 "Photo.c" } #line 2272 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); @@ -18082,17 +18605,19 @@ static void photo_file_exif_updated (Photo* self) { _g_object_unref0 (info); #line 2272 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 18084 "Photo.c" +#line 18607 "Photo.c" } -static guint64 photo_real_get_filesize (MediaSource* base) { +static guint64 +photo_real_get_filesize (MediaSource* base) +{ Photo * self; guint64 result = 0ULL; GError * _inner_error_ = NULL; #line 2312 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18094 "Photo.c" +#line 18619 "Photo.c" { PhotoRow* _tmp0_; guint64 _tmp5_ = 0ULL; @@ -18100,7 +18625,7 @@ static guint64 photo_real_get_filesize (MediaSource* base) { _tmp0_ = self->row; #line 2313 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18102 "Photo.c" +#line 18627 "Photo.c" { BackingPhotoRow* _tmp1_; gint64 _tmp2_; @@ -18110,18 +18635,18 @@ static guint64 photo_real_get_filesize (MediaSource* base) { _tmp2_ = _tmp1_->filesize; #line 2314 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp2_; -#line 18112 "Photo.c" +#line 18637 "Photo.c" { PhotoRow* _tmp3_; #line 2313 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2313 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18119 "Photo.c" +#line 18644 "Photo.c" } #line 2314 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18123 "Photo.c" +#line 18648 "Photo.c" } __finally357: { @@ -18130,7 +18655,7 @@ static guint64 photo_real_get_filesize (MediaSource* base) { _tmp4_ = self->row; #line 2313 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18132 "Photo.c" +#line 18657 "Photo.c" } #line 2313 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -18138,18 +18663,20 @@ static guint64 photo_real_get_filesize (MediaSource* base) { g_clear_error (&_inner_error_); #line 2313 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 18140 "Photo.c" +#line 18665 "Photo.c" } } -static guint64 photo_real_get_master_filesize (MediaSource* base) { +static guint64 +photo_real_get_master_filesize (MediaSource* base) +{ Photo * self; guint64 result = 0ULL; GError * _inner_error_ = NULL; #line 2318 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18151 "Photo.c" +#line 18678 "Photo.c" { PhotoRow* _tmp0_; guint64 _tmp6_ = 0ULL; @@ -18157,7 +18684,7 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { _tmp0_ = self->row; #line 2319 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18159 "Photo.c" +#line 18686 "Photo.c" { PhotoRow* _tmp1_; BackingPhotoRow* _tmp2_; @@ -18170,18 +18697,18 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { _tmp3_ = _tmp2_->filesize; #line 2320 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp3_; -#line 18172 "Photo.c" +#line 18699 "Photo.c" { PhotoRow* _tmp4_; #line 2319 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2319 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18179 "Photo.c" +#line 18706 "Photo.c" } #line 2320 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18183 "Photo.c" +#line 18710 "Photo.c" } __finally358: { @@ -18190,7 +18717,7 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { _tmp5_ = self->row; #line 2319 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18192 "Photo.c" +#line 18719 "Photo.c" } #line 2319 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -18198,17 +18725,19 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) { g_clear_error (&_inner_error_); #line 2319 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp6_; -#line 18200 "Photo.c" +#line 18727 "Photo.c" } } -guint64 photo_get_editable_filesize (Photo* self) { +guint64 +photo_get_editable_filesize (Photo* self) +{ guint64 result = 0ULL; GError * _inner_error_ = NULL; #line 2324 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0ULL); -#line 18210 "Photo.c" +#line 18739 "Photo.c" { PhotoRow* _tmp0_; guint64 _tmp5_ = 0ULL; @@ -18216,7 +18745,7 @@ guint64 photo_get_editable_filesize (Photo* self) { _tmp0_ = self->row; #line 2325 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18218 "Photo.c" +#line 18747 "Photo.c" { BackingPhotoRow* _tmp1_; gint64 _tmp2_; @@ -18226,18 +18755,18 @@ guint64 photo_get_editable_filesize (Photo* self) { _tmp2_ = _tmp1_->filesize; #line 2326 "/home/jens/Source/shotwell/src/Photo.vala" result = (guint64) _tmp2_; -#line 18228 "Photo.c" +#line 18757 "Photo.c" { PhotoRow* _tmp3_; #line 2325 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2325 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18235 "Photo.c" +#line 18764 "Photo.c" } #line 2326 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18239 "Photo.c" +#line 18768 "Photo.c" } __finally359: { @@ -18246,7 +18775,7 @@ guint64 photo_get_editable_filesize (Photo* self) { _tmp4_ = self->row; #line 2325 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18248 "Photo.c" +#line 18777 "Photo.c" } #line 2325 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -18254,12 +18783,14 @@ guint64 photo_get_editable_filesize (Photo* self) { g_clear_error (&_inner_error_); #line 2325 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 18256 "Photo.c" +#line 18785 "Photo.c" } } -static time_t photo_real_get_exposure_time (Dateable* base) { +static time_t +photo_real_get_exposure_time (Dateable* base) +{ Photo * self; time_t result = 0; time_t _tmp0_; @@ -18271,24 +18802,26 @@ static time_t photo_real_get_exposure_time (Dateable* base) { result = _tmp0_; #line 2331 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18273 "Photo.c" +#line 18804 "Photo.c" } -static gchar* photo_real_get_basename (MediaSource* base) { +static gchar* +photo_real_get_basename (MediaSource* base) +{ Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; #line 2334 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18283 "Photo.c" +#line 18816 "Photo.c" { PhotoRow* _tmp0_; #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18290 "Photo.c" +#line 18823 "Photo.c" { const gchar* _tmp1_; gchar* _tmp2_; @@ -18298,18 +18831,18 @@ static gchar* photo_real_get_basename (MediaSource* base) { _tmp2_ = g_strdup (_tmp1_); #line 2336 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 18300 "Photo.c" +#line 18833 "Photo.c" { PhotoRow* _tmp3_; #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18307 "Photo.c" +#line 18840 "Photo.c" } #line 2336 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18311 "Photo.c" +#line 18844 "Photo.c" } __finally360: { @@ -18318,7 +18851,7 @@ static gchar* photo_real_get_basename (MediaSource* base) { _tmp4_ = self->row; #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18320 "Photo.c" +#line 18853 "Photo.c" } #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -18326,25 +18859,27 @@ static gchar* photo_real_get_basename (MediaSource* base) { g_clear_error (&_inner_error_); #line 2335 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18328 "Photo.c" +#line 18861 "Photo.c" } } -static gchar* photo_real_get_title (MediaSource* base) { +static gchar* +photo_real_get_title (MediaSource* base) +{ Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; #line 2340 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18339 "Photo.c" +#line 18874 "Photo.c" { PhotoRow* _tmp0_; #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18346 "Photo.c" +#line 18881 "Photo.c" { PhotoRow* _tmp1_; const gchar* _tmp2_; @@ -18357,18 +18892,18 @@ static gchar* photo_real_get_title (MediaSource* base) { _tmp3_ = g_strdup (_tmp2_); #line 2342 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 18359 "Photo.c" +#line 18894 "Photo.c" { PhotoRow* _tmp4_; #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18366 "Photo.c" +#line 18901 "Photo.c" } #line 2342 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18370 "Photo.c" +#line 18905 "Photo.c" } __finally361: { @@ -18377,7 +18912,7 @@ static gchar* photo_real_get_title (MediaSource* base) { _tmp5_ = self->row; #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18379 "Photo.c" +#line 18914 "Photo.c" } #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -18385,25 +18920,27 @@ static gchar* photo_real_get_title (MediaSource* base) { g_clear_error (&_inner_error_); #line 2341 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18387 "Photo.c" +#line 18922 "Photo.c" } } -static gchar* photo_real_get_comment (MediaSource* base) { +static gchar* +photo_real_get_comment (MediaSource* base) +{ Photo * self; gchar* result = NULL; GError * _inner_error_ = NULL; #line 2346 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 18398 "Photo.c" +#line 18935 "Photo.c" { PhotoRow* _tmp0_; #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18405 "Photo.c" +#line 18942 "Photo.c" { PhotoRow* _tmp1_; const gchar* _tmp2_; @@ -18416,18 +18953,18 @@ static gchar* photo_real_get_comment (MediaSource* base) { _tmp3_ = g_strdup (_tmp2_); #line 2348 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 18418 "Photo.c" +#line 18955 "Photo.c" { PhotoRow* _tmp4_; #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18425 "Photo.c" +#line 18962 "Photo.c" } #line 2348 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18429 "Photo.c" +#line 18966 "Photo.c" } __finally362: { @@ -18436,7 +18973,7 @@ static gchar* photo_real_get_comment (MediaSource* base) { _tmp5_ = self->row; #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18438 "Photo.c" +#line 18975 "Photo.c" } #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -18444,116 +18981,113 @@ static gchar* photo_real_get_comment (MediaSource* base) { g_clear_error (&_inner_error_); #line 2347 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 18446 "Photo.c" +#line 18983 "Photo.c" } } -static void photo_real_set_title (MediaSource* base, const gchar* title) { +static void +photo_real_set_title (MediaSource* base, + const gchar* title) +{ Photo * self; gchar* new_title = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gboolean committed = FALSE; - gboolean _tmp18_; + gboolean _tmp16_; GError * _inner_error_ = NULL; #line 2352 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2353 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = title; -#line 2353 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_source_prep_title (_tmp0_); + _tmp0_ = media_source_prep_title (title); #line 2353 "/home/jens/Source/shotwell/src/Photo.vala" - new_title = _tmp1_; + new_title = _tmp0_; #line 2355 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 18469 "Photo.c" +#line 19006 "Photo.c" { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18476 "Photo.c" +#line 19013 "Photo.c" { - const gchar* _tmp3_; - PhotoRow* _tmp4_; - const gchar* _tmp5_; + const gchar* _tmp2_; + PhotoRow* _tmp3_; + const gchar* _tmp4_; + PhotoTable* _tmp6_; PhotoTable* _tmp7_; - PhotoTable* _tmp8_; - PhotoRow* _tmp9_; - PhotoID _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; + PhotoRow* _tmp8_; + PhotoID _tmp9_; + const gchar* _tmp10_; + gboolean _tmp11_; #line 2357 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = new_title; + _tmp2_ = new_title; #line 2357 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 2357 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->title; + _tmp4_ = _tmp3_->title; #line 2357 "/home/jens/Source/shotwell/src/Photo.vala" - if (g_strcmp0 (_tmp3_, _tmp5_) == 0) { -#line 18496 "Photo.c" + if (g_strcmp0 (_tmp2_, _tmp4_) == 0) { +#line 19032 "Photo.c" { - PhotoRow* _tmp6_; + PhotoRow* _tmp5_; #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18503 "Photo.c" +#line 19039 "Photo.c" } #line 2358 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_title); #line 2358 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18509 "Photo.c" +#line 19045 "Photo.c" } #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_table_get_instance (); -#line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _tmp6_ = photo_table_get_instance (); #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = self->row; + _tmp7_ = _tmp6_; #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_->photo_id; + _tmp8_ = self->row; #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = new_title; + _tmp9_ = _tmp8_->photo_id; #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_set_title (_tmp8_, &_tmp10_, _tmp11_); + _tmp10_ = new_title; #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp12_; + committed = photo_table_set_title (_tmp7_, &_tmp9_, _tmp10_); #line 2360 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp8_); + _database_table_unref0 (_tmp7_); #line 2361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = committed; + _tmp11_ = committed; #line 2361 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_) { -#line 18531 "Photo.c" - PhotoRow* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; + if (_tmp11_) { +#line 19065 "Photo.c" + PhotoRow* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; #line 2362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp12_ = self->row; #line 2362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = new_title; + _tmp13_ = new_title; #line 2362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp14_ = g_strdup (_tmp13_); #line 2362 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp14_->title); + _g_free0 (_tmp12_->title); #line 2362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_->title = _tmp16_; -#line 18545 "Photo.c" + _tmp12_->title = _tmp14_; +#line 19079 "Photo.c" } } __finally363: { - PhotoRow* _tmp17_; + PhotoRow* _tmp15_; #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = self->row; + _tmp15_ = self->row; #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18555 "Photo.c" +#line 19089 "Photo.c" } #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -18565,145 +19099,142 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) { g_clear_error (&_inner_error_); #line 2356 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18567 "Photo.c" +#line 19101 "Photo.c" } } #line 2365 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = committed; + _tmp16_ = committed; #line 2365 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_) { -#line 18574 "Photo.c" - Alteration* _tmp19_; - Alteration* _tmp20_; + if (_tmp16_) { +#line 19108 "Photo.c" + Alteration* _tmp17_; + Alteration* _tmp18_; #line 2366 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = alteration_new ("metadata", "name"); + _tmp17_ = alteration_new ("metadata", "name"); #line 2366 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp18_ = _tmp17_; #line 2366 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_); #line 2366 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp20_); -#line 18585 "Photo.c" + _alteration_unref0 (_tmp18_); +#line 19119 "Photo.c" } #line 2352 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_title); -#line 18589 "Photo.c" +#line 19123 "Photo.c" } -static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) { +static gboolean +photo_real_set_comment (MediaSource* base, + const gchar* comment) +{ Photo * self; gboolean result = FALSE; gchar* new_comment = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gboolean committed = FALSE; - gboolean _tmp19_; + gboolean _tmp17_; GError * _inner_error_ = NULL; #line 2369 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2370 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = comment; -#line 2370 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_source_prep_comment (_tmp0_); + _tmp0_ = media_source_prep_comment (comment); #line 2370 "/home/jens/Source/shotwell/src/Photo.vala" - new_comment = _tmp1_; + new_comment = _tmp0_; #line 2372 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 18612 "Photo.c" +#line 19146 "Photo.c" { - PhotoRow* _tmp2_; + PhotoRow* _tmp1_; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp1_ = self->row; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18619 "Photo.c" +#line 19153 "Photo.c" { - const gchar* _tmp3_; - PhotoRow* _tmp4_; - const gchar* _tmp5_; + const gchar* _tmp2_; + PhotoRow* _tmp3_; + const gchar* _tmp4_; + PhotoTable* _tmp6_; PhotoTable* _tmp7_; - PhotoTable* _tmp8_; - PhotoRow* _tmp9_; - PhotoID _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; + PhotoRow* _tmp8_; + PhotoID _tmp9_; + const gchar* _tmp10_; + gboolean _tmp11_; #line 2374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = new_comment; + _tmp2_ = new_comment; #line 2374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp3_ = self->row; #line 2374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->comment; + _tmp4_ = _tmp3_->comment; #line 2374 "/home/jens/Source/shotwell/src/Photo.vala" - if (g_strcmp0 (_tmp3_, _tmp5_) == 0) { + if (g_strcmp0 (_tmp2_, _tmp4_) == 0) { #line 2375 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 18641 "Photo.c" +#line 19174 "Photo.c" { - PhotoRow* _tmp6_; + PhotoRow* _tmp5_; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18648 "Photo.c" +#line 19181 "Photo.c" } #line 2375 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_comment); #line 2375 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18654 "Photo.c" +#line 19187 "Photo.c" } #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_table_get_instance (); -#line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _tmp6_ = photo_table_get_instance (); #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = self->row; + _tmp7_ = _tmp6_; #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_->photo_id; + _tmp8_ = self->row; #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = new_comment; + _tmp9_ = _tmp8_->photo_id; #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_set_comment (_tmp8_, &_tmp10_, _tmp11_); + _tmp10_ = new_comment; #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp12_; + committed = photo_table_set_comment (_tmp7_, &_tmp9_, _tmp10_); #line 2377 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp8_); + _database_table_unref0 (_tmp7_); #line 2378 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = committed; + _tmp11_ = committed; #line 2378 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_) { -#line 18676 "Photo.c" - PhotoRow* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; + if (_tmp11_) { +#line 19207 "Photo.c" + PhotoRow* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; #line 2379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp12_ = self->row; #line 2379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = new_comment; + _tmp13_ = new_comment; #line 2379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = g_strdup (_tmp15_); + _tmp14_ = g_strdup (_tmp13_); #line 2379 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp14_->comment); + _g_free0 (_tmp12_->comment); #line 2379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_->comment = _tmp16_; -#line 18690 "Photo.c" + _tmp12_->comment = _tmp14_; +#line 19221 "Photo.c" } } __finally364: { - PhotoRow* _tmp17_; + PhotoRow* _tmp15_; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = self->row; + _tmp15_ = self->row; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18700 "Photo.c" +#line 19231 "Photo.c" } #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18704 "Photo.c" - gboolean _tmp18_ = FALSE; +#line 19235 "Photo.c" + gboolean _tmp16_ = FALSE; #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (new_comment); #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" @@ -18711,26 +19242,26 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2373 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp18_; -#line 18714 "Photo.c" + return _tmp16_; +#line 19245 "Photo.c" } } #line 2382 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = committed; + _tmp17_ = committed; #line 2382 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp19_) { -#line 18721 "Photo.c" - Alteration* _tmp20_; - Alteration* _tmp21_; + if (_tmp17_) { +#line 19252 "Photo.c" + Alteration* _tmp18_; + Alteration* _tmp19_; #line 2383 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = alteration_new ("metadata", "comment"); + _tmp18_ = alteration_new ("metadata", "comment"); #line 2383 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 2383 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp19_); #line 2383 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp21_); -#line 18732 "Photo.c" + _alteration_unref0 (_tmp19_); +#line 19263 "Photo.c" } #line 2385 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; @@ -18738,18 +19269,23 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment) _g_free0 (new_comment); #line 2385 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 18740 "Photo.c" +#line 19271 "Photo.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 2395 "/home/jens/Source/shotwell/src/Photo.vala" return self ? g_error_copy (self) : NULL; -#line 18747 "Photo.c" +#line 19280 "Photo.c" } -void photo_set_import_id (Photo* self, ImportID* import_id) { +void +photo_set_import_id (Photo* self, + ImportID* import_id) +{ GError* dberr = NULL; GError* _tmp13_; GError * _inner_error_ = NULL; @@ -18759,14 +19295,14 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_return_if_fail (import_id != NULL); #line 2389 "/home/jens/Source/shotwell/src/Photo.vala" dberr = NULL; -#line 18761 "Photo.c" +#line 19297 "Photo.c" { PhotoRow* _tmp0_; #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 18768 "Photo.c" +#line 19304 "Photo.c" { { PhotoTable* _tmp1_; @@ -18794,7 +19330,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2392 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 18796 "Photo.c" +#line 19332 "Photo.c" goto __catch366_database_error; } { @@ -18803,7 +19339,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { _tmp6_ = self->row; #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18805 "Photo.c" +#line 19341 "Photo.c" } #line 2392 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); @@ -18813,7 +19349,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_clear_error (&_inner_error_); #line 2392 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18815 "Photo.c" +#line 19351 "Photo.c" } #line 2393 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = self->row; @@ -18821,7 +19357,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { _tmp8_ = *import_id; #line 2393 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_->import_id = _tmp8_; -#line 18823 "Photo.c" +#line 19359 "Photo.c" } goto __finally366; __catch366_database_error: @@ -18843,19 +19379,19 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { dberr = _tmp10_; #line 2391 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 18845 "Photo.c" +#line 19381 "Photo.c" } __finally366: #line 2391 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 18850 "Photo.c" +#line 19386 "Photo.c" { PhotoRow* _tmp11_; #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->row; #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18857 "Photo.c" +#line 19393 "Photo.c" } #line 2391 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); @@ -18865,7 +19401,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_clear_error (&_inner_error_); #line 2391 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18867 "Photo.c" +#line 19403 "Photo.c" } } __finally365: @@ -18875,7 +19411,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { _tmp12_ = self->row; #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 18877 "Photo.c" +#line 19413 "Photo.c" } #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -18887,14 +19423,14 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_clear_error (&_inner_error_); #line 2390 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18889 "Photo.c" +#line 19425 "Photo.c" } } #line 2399 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = dberr; #line 2399 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp13_ == NULL) { -#line 18896 "Photo.c" +#line 19432 "Photo.c" Alteration* _tmp14_; Alteration* _tmp15_; #line 2400 "/home/jens/Source/shotwell/src/Photo.vala" @@ -18905,7 +19441,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_); #line 2400 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp15_); -#line 18907 "Photo.c" +#line 19443 "Photo.c" } else { gchar* _tmp16_; gchar* _tmp17_; @@ -18923,32 +19459,32 @@ void photo_set_import_id (Photo* self, ImportID* import_id) { g_warning ("Photo.vala:2402: Unable to write import ID for %s: %s", _tmp17_, _tmp19_); #line 2402 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp17_); -#line 18925 "Photo.c" +#line 19461 "Photo.c" } #line 2388 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (dberr); -#line 18929 "Photo.c" +#line 19465 "Photo.c" } -void photo_set_title_persistent (Photo* self, const gchar* title, GError** error) { +void +photo_set_title_persistent (Photo* self, + const gchar* title, + GError** error) +{ PhotoFileReader* source = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; - PhotoFileFormat _tmp2_; - gboolean _tmp3_; PhotoMetadata* metadata = NULL; - PhotoFileReader* _tmp8_; - PhotoMetadata* _tmp9_; - PhotoMetadata* _tmp10_; - const gchar* _tmp11_; + PhotoFileReader* _tmp5_; + PhotoMetadata* _tmp6_; + PhotoMetadata* _tmp7_; PhotoFileMetadataWriter* writer = NULL; - PhotoFileReader* _tmp12_; - PhotoFileMetadataWriter* _tmp13_; - PhotoFileReader* _tmp14_; - GFile* _tmp15_; - GFile* _tmp16_; - const gchar* _tmp22_; + PhotoFileReader* _tmp8_; + PhotoFileMetadataWriter* _tmp9_; + PhotoFileReader* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; GError * _inner_error_ = NULL; #line 2405 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -18959,42 +19495,35 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error #line 2409 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = source; #line 2409 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2409 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2409 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { -#line 18966 "Photo.c" - PhotoFileReader* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - const gchar* _tmp7_; + if (!photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)))) { +#line 19498 "Photo.c" + PhotoFileReader* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 2410 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = source; + _tmp2_ = source; #line 2410 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp3_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2410 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 2410 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2410: No photo file writer available for %s", _tmp6_); + g_warning ("Photo.vala:2410: No photo file writer available for %s", _tmp4_); #line 2410 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp6_); -#line 2412 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = title; + _g_free0 (_tmp4_); #line 2412 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_); + media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), title); #line 2414 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); #line 2414 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 18989 "Photo.c" +#line 19518 "Photo.c" } #line 2417 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = source; + _tmp5_ = source; #line 2417 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_); + _tmp6_ = photo_file_reader_read_metadata (_tmp5_, &_inner_error_); #line 2417 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp9_; + metadata = _tmp6_; #line 2417 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2417 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19003,20 +19532,18 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _photo_file_adapter_unref0 (source); #line 2417 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19005 "Photo.c" +#line 19534 "Photo.c" } #line 2418 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = metadata; -#line 2418 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = title; + _tmp7_ = metadata; #line 2418 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_title (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_title (_tmp7_, title, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 2420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = source; + _tmp8_ = source; #line 2420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_); + _tmp9_ = photo_file_reader_create_metadata_writer (_tmp8_, &_inner_error_); #line 2420 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp13_; + writer = _tmp9_; #line 2420 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2420 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19027,50 +19554,50 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _photo_file_adapter_unref0 (source); #line 2420 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19029 "Photo.c" +#line 19556 "Photo.c" } #line 2421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = source; + _tmp10_ = source; #line 2421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp11_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 2421 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_title"); + library_monitor_blacklist_file (_tmp12_, "Photo.set_persistent_title"); #line 2421 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp16_); -#line 19041 "Photo.c" + _g_object_unref0 (_tmp12_); +#line 19568 "Photo.c" { - PhotoFileMetadataWriter* _tmp17_; - PhotoMetadata* _tmp18_; + PhotoFileMetadataWriter* _tmp13_; + PhotoMetadata* _tmp14_; #line 2423 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = writer; + _tmp13_ = writer; #line 2423 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = metadata; + _tmp14_ = metadata; #line 2423 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp13_, _tmp14_, &_inner_error_); #line 2423 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 19053 "Photo.c" +#line 19580 "Photo.c" goto __finally367; } } __finally367: { - PhotoFileReader* _tmp19_; - GFile* _tmp20_; - GFile* _tmp21_; + PhotoFileReader* _tmp15_; + GFile* _tmp16_; + GFile* _tmp17_; #line 2425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = source; + _tmp15_ = source; #line 2425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp16_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_; + _tmp17_ = _tmp16_; #line 2425 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_unblacklist_file (_tmp21_); + library_monitor_unblacklist_file (_tmp17_); #line 2425 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp21_); -#line 19072 "Photo.c" + _g_object_unref0 (_tmp17_); +#line 19599 "Photo.c" } #line 2422 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -19084,12 +19611,10 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _photo_file_adapter_unref0 (source); #line 2422 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19086 "Photo.c" +#line 19613 "Photo.c" } #line 2428 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = title; -#line 2428 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_); + media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), title); #line 2430 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_exif_updated (self); #line 2405 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19098,28 +19623,28 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error _media_metadata_unref0 (metadata); #line 2405 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 19100 "Photo.c" +#line 19625 "Photo.c" } -void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** error) { +void +photo_set_comment_persistent (Photo* self, + const gchar* comment, + GError** error) +{ PhotoFileReader* source = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; - PhotoFileFormat _tmp2_; - gboolean _tmp3_; PhotoMetadata* metadata = NULL; - PhotoFileReader* _tmp8_; - PhotoMetadata* _tmp9_; - PhotoMetadata* _tmp10_; - const gchar* _tmp11_; + PhotoFileReader* _tmp5_; + PhotoMetadata* _tmp6_; + PhotoMetadata* _tmp7_; PhotoFileMetadataWriter* writer = NULL; - PhotoFileReader* _tmp12_; - PhotoFileMetadataWriter* _tmp13_; - PhotoFileReader* _tmp14_; - GFile* _tmp15_; - GFile* _tmp16_; - const gchar* _tmp22_; + PhotoFileReader* _tmp8_; + PhotoFileMetadataWriter* _tmp9_; + PhotoFileReader* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; GError * _inner_error_ = NULL; #line 2433 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -19130,42 +19655,35 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e #line 2437 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = source; #line 2437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2437 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { -#line 19137 "Photo.c" - PhotoFileReader* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - const gchar* _tmp7_; + if (!photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)))) { +#line 19658 "Photo.c" + PhotoFileReader* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 2438 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = source; + _tmp2_ = source; #line 2438 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp3_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2438 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 2438 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2438: No photo file writer available for %s", _tmp6_); + g_warning ("Photo.vala:2438: No photo file writer available for %s", _tmp4_); #line 2438 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp6_); -#line 2440 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = comment; + _g_free0 (_tmp4_); #line 2440 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_); + media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), comment); #line 2442 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); #line 2442 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19160 "Photo.c" +#line 19678 "Photo.c" } #line 2445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = source; + _tmp5_ = source; #line 2445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_); + _tmp6_ = photo_file_reader_read_metadata (_tmp5_, &_inner_error_); #line 2445 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp9_; + metadata = _tmp6_; #line 2445 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2445 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19174,20 +19692,18 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _photo_file_adapter_unref0 (source); #line 2445 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19176 "Photo.c" +#line 19694 "Photo.c" } #line 2446 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = metadata; -#line 2446 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = comment; + _tmp7_ = metadata; #line 2446 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_comment (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_comment (_tmp7_, comment, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 2448 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = source; + _tmp8_ = source; #line 2448 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_); + _tmp9_ = photo_file_reader_create_metadata_writer (_tmp8_, &_inner_error_); #line 2448 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp13_; + writer = _tmp9_; #line 2448 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2448 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19198,50 +19714,50 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _photo_file_adapter_unref0 (source); #line 2448 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19200 "Photo.c" +#line 19716 "Photo.c" } #line 2449 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = source; + _tmp10_ = source; #line 2449 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp11_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2449 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 2449 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_comment"); + library_monitor_blacklist_file (_tmp12_, "Photo.set_persistent_comment"); #line 2449 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp16_); -#line 19212 "Photo.c" + _g_object_unref0 (_tmp12_); +#line 19728 "Photo.c" { - PhotoFileMetadataWriter* _tmp17_; - PhotoMetadata* _tmp18_; + PhotoFileMetadataWriter* _tmp13_; + PhotoMetadata* _tmp14_; #line 2451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = writer; + _tmp13_ = writer; #line 2451 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = metadata; + _tmp14_ = metadata; #line 2451 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp13_, _tmp14_, &_inner_error_); #line 2451 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 19224 "Photo.c" +#line 19740 "Photo.c" goto __finally368; } } __finally368: { - PhotoFileReader* _tmp19_; - GFile* _tmp20_; - GFile* _tmp21_; + PhotoFileReader* _tmp15_; + GFile* _tmp16_; + GFile* _tmp17_; #line 2453 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = source; + _tmp15_ = source; #line 2453 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp16_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2453 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_; + _tmp17_ = _tmp16_; #line 2453 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_unblacklist_file (_tmp21_); + library_monitor_unblacklist_file (_tmp17_); #line 2453 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp21_); -#line 19243 "Photo.c" + _g_object_unref0 (_tmp17_); +#line 19759 "Photo.c" } #line 2450 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -19255,12 +19771,10 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _photo_file_adapter_unref0 (source); #line 2450 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19257 "Photo.c" +#line 19773 "Photo.c" } #line 2456 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = comment; -#line 2456 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_); + media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), comment); #line 2458 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_exif_updated (self); #line 2433 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19269,33 +19783,34 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e _media_metadata_unref0 (metadata); #line 2433 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 19271 "Photo.c" +#line 19785 "Photo.c" } -static void photo_real_set_exposure_time (Dateable* base, time_t time) { +static void +photo_real_set_exposure_time (Dateable* base, + time_t time) +{ Photo * self; gboolean committed = FALSE; - gboolean _tmp12_; + gboolean _tmp8_; GError * _inner_error_ = NULL; #line 2461 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 19282 "Photo.c" +#line 19799 "Photo.c" { PhotoRow* _tmp0_; #line 2463 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2463 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19289 "Photo.c" +#line 19806 "Photo.c" { PhotoTable* _tmp1_; PhotoTable* _tmp2_; PhotoRow* _tmp3_; PhotoID _tmp4_; - time_t _tmp5_; - gboolean _tmp6_; - gboolean _tmp7_; + gboolean _tmp5_; #line 2464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); #line 2464 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19305,42 +19820,32 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { #line 2464 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->photo_id; #line 2464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = time; -#line 2464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_); -#line 2464 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp6_; + committed = photo_table_set_exposure_time (_tmp2_, &_tmp4_, time); #line 2464 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); #line 2465 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = committed; + _tmp5_ = committed; #line 2465 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_) { -#line 19318 "Photo.c" - PhotoRow* _tmp8_; - time_t _tmp9_; - time_t _tmp10_; -#line 2466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->row; + if (_tmp5_) { +#line 19829 "Photo.c" + PhotoRow* _tmp6_; #line 2466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = time; + _tmp6_ = self->row; #line 2466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_->exposure_time = _tmp9_; -#line 2467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = time; + _tmp6_->exposure_time = time; #line 2467 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->cached_exposure_time = _tmp10_; -#line 19332 "Photo.c" + self->priv->cached_exposure_time = time; +#line 19837 "Photo.c" } } __finally369: { - PhotoRow* _tmp11_; + PhotoRow* _tmp7_; #line 2463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + _tmp7_ = self->row; #line 2463 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19342 "Photo.c" +#line 19847 "Photo.c" } #line 2463 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -19350,49 +19855,49 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) { g_clear_error (&_inner_error_); #line 2463 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19352 "Photo.c" +#line 19857 "Photo.c" } } #line 2471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = committed; + _tmp8_ = committed; #line 2471 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { -#line 19359 "Photo.c" - Alteration* _tmp13_; - Alteration* _tmp14_; + if (_tmp8_) { +#line 19864 "Photo.c" + Alteration* _tmp9_; + Alteration* _tmp10_; #line 2472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = alteration_new ("metadata", "exposure-time"); + _tmp9_ = alteration_new ("metadata", "exposure-time"); #line 2472 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_; + _tmp10_ = _tmp9_; #line 2472 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp10_); #line 2472 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp14_); -#line 19370 "Photo.c" + _alteration_unref0 (_tmp10_); +#line 19875 "Photo.c" } } -void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** error) { +void +photo_set_exposure_time_persistent (Photo* self, + time_t time, + GError** error) +{ PhotoFileReader* source = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; - PhotoFileFormat _tmp2_; - gboolean _tmp3_; PhotoMetadata* metadata = NULL; - PhotoFileReader* _tmp8_; - PhotoMetadata* _tmp9_; - PhotoMetadata* _tmp10_; - time_t _tmp11_; - MetadataDateTime* _tmp12_; - MetadataDateTime* _tmp13_; + PhotoFileReader* _tmp5_; + PhotoMetadata* _tmp6_; + PhotoMetadata* _tmp7_; + MetadataDateTime* _tmp8_; + MetadataDateTime* _tmp9_; PhotoFileMetadataWriter* writer = NULL; - PhotoFileReader* _tmp14_; - PhotoFileMetadataWriter* _tmp15_; - PhotoFileReader* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; - time_t _tmp24_; + PhotoFileReader* _tmp10_; + PhotoFileMetadataWriter* _tmp11_; + PhotoFileReader* _tmp12_; + GFile* _tmp13_; + GFile* _tmp14_; GError * _inner_error_ = NULL; #line 2475 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -19403,42 +19908,35 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro #line 2479 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = source; #line 2479 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2479 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2479 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { -#line 19410 "Photo.c" - PhotoFileReader* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - time_t _tmp7_; + if (!photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)))) { +#line 19911 "Photo.c" + PhotoFileReader* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 2480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = source; + _tmp2_ = source; #line 2480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp3_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 2480 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:2480: No photo file writer available for %s", _tmp6_); + g_warning ("Photo.vala:2480: No photo file writer available for %s", _tmp4_); #line 2480 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp6_); -#line 2482 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = time; + _g_free0 (_tmp4_); #line 2482 "/home/jens/Source/shotwell/src/Photo.vala" - dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp7_); + dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), time); #line 2484 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); #line 2484 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19433 "Photo.c" +#line 19931 "Photo.c" } #line 2487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = source; + _tmp5_ = source; #line 2487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_); + _tmp6_ = photo_file_reader_read_metadata (_tmp5_, &_inner_error_); #line 2487 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp9_; + metadata = _tmp6_; #line 2487 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2487 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19447,26 +19945,24 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _photo_file_adapter_unref0 (source); #line 2487 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19449 "Photo.c" +#line 19947 "Photo.c" } #line 2488 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = metadata; -#line 2488 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = time; + _tmp7_ = metadata; #line 2488 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = metadata_date_time_new (_tmp11_); + _tmp8_ = metadata_date_time_new (time); #line 2488 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; + _tmp9_ = _tmp8_; #line 2488 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_exposure_date_time (_tmp10_, _tmp13_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_exposure_date_time (_tmp7_, _tmp9_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 2488 "/home/jens/Source/shotwell/src/Photo.vala" - _metadata_date_time_unref0 (_tmp13_); + _metadata_date_time_unref0 (_tmp9_); #line 2490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = source; + _tmp10_ = source; #line 2490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_reader_create_metadata_writer (_tmp14_, &_inner_error_); + _tmp11_ = photo_file_reader_create_metadata_writer (_tmp10_, &_inner_error_); #line 2490 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp15_; + writer = _tmp11_; #line 2490 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2490 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19477,50 +19973,50 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _photo_file_adapter_unref0 (source); #line 2490 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19479 "Photo.c" +#line 19975 "Photo.c" } #line 2491 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = source; + _tmp12_ = source; #line 2491 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp13_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2491 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 2491 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_blacklist_file (_tmp18_, "Photo.set_exposure_time_persistent"); + library_monitor_blacklist_file (_tmp14_, "Photo.set_exposure_time_persistent"); #line 2491 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp18_); -#line 19491 "Photo.c" + _g_object_unref0 (_tmp14_); +#line 19987 "Photo.c" { - PhotoFileMetadataWriter* _tmp19_; - PhotoMetadata* _tmp20_; + PhotoFileMetadataWriter* _tmp15_; + PhotoMetadata* _tmp16_; #line 2493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = writer; + _tmp15_ = writer; #line 2493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = metadata; + _tmp16_ = metadata; #line 2493 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp19_, _tmp20_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp15_, _tmp16_, &_inner_error_); #line 2493 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 19503 "Photo.c" +#line 19999 "Photo.c" goto __finally370; } } __finally370: { - PhotoFileReader* _tmp21_; - GFile* _tmp22_; - GFile* _tmp23_; + PhotoFileReader* _tmp17_; + GFile* _tmp18_; + GFile* _tmp19_; #line 2495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = source; + _tmp17_ = source; #line 2495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp18_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 2495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_; + _tmp19_ = _tmp18_; #line 2495 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_unblacklist_file (_tmp23_); + library_monitor_unblacklist_file (_tmp19_); #line 2495 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp23_); -#line 19522 "Photo.c" + _g_object_unref0 (_tmp19_); +#line 20018 "Photo.c" } #line 2492 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -19534,12 +20030,10 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _photo_file_adapter_unref0 (source); #line 2492 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19536 "Photo.c" +#line 20032 "Photo.c" } #line 2498 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = time; -#line 2498 "/home/jens/Source/shotwell/src/Photo.vala" - dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp24_); + dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), time); #line 2500 "/home/jens/Source/shotwell/src/Photo.vala" photo_file_exif_updated (self); #line 2475 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19548,7 +20042,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro _media_metadata_unref0 (metadata); #line 2475 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (source); -#line 19550 "Photo.c" +#line 20044 "Photo.c" } @@ -19565,16 +20059,14 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro * Pipeline steps that do not affect the image geometry are * ignored. */ -static void photo_real_get_dimensions (MediaSource* base, PhotoException disallowed_steps, Dimensions* result) { +static void +photo_real_get_dimensions (MediaSource* base, + PhotoException disallowed_steps, + Dimensions* result) +{ Photo * self; Dimensions returned_dims = {0}; Dimensions _tmp0_ = {0}; - PhotoException _tmp1_; - gboolean _tmp2_; - PhotoException _tmp10_; - gboolean _tmp11_; - PhotoException _tmp22_; - gboolean _tmp23_; #line 2516 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); #line 2518 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19582,23 +20074,16 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo #line 2518 "/home/jens/Source/shotwell/src/Photo.vala" returned_dims = _tmp0_; #line 2521 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = disallowed_steps; -#line 2521 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_exception_allows (_tmp1_, PHOTO_EXCEPTION_ORIENTATION); -#line 2521 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { -#line 19589 "Photo.c" + if (photo_exception_allows (disallowed_steps, PHOTO_EXCEPTION_ORIENTATION)) { +#line 20077 "Photo.c" Orientation ori_tmp = 0; - Orientation _tmp3_; - Orientation _tmp4_; + Orientation _tmp1_; #line 2522 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_orientation (self); -#line 2522 "/home/jens/Source/shotwell/src/Photo.vala" - ori_tmp = _tmp3_; + ori_tmp = photo_get_orientation (self); #line 2525 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = ori_tmp; + _tmp1_ = ori_tmp; #line 2525 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp4_) { + switch (_tmp1_) { #line 2525 "/home/jens/Source/shotwell/src/Photo.vala" case ORIENTATION_LEFT_TOP: #line 2525 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19607,131 +20092,122 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo case ORIENTATION_LEFT_BOTTOM: #line 2525 "/home/jens/Source/shotwell/src/Photo.vala" case ORIENTATION_RIGHT_BOTTOM: -#line 19609 "Photo.c" +#line 20094 "Photo.c" { gint width_tmp = 0; - Dimensions _tmp5_; + Dimensions _tmp2_; + gint _tmp3_; + Dimensions _tmp4_; + gint _tmp5_; gint _tmp6_; - Dimensions _tmp7_; - gint _tmp8_; - gint _tmp9_; #line 2531 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = returned_dims; + _tmp2_ = returned_dims; #line 2531 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_.width; + _tmp3_ = _tmp2_.width; #line 2531 "/home/jens/Source/shotwell/src/Photo.vala" - width_tmp = _tmp6_; + width_tmp = _tmp3_; #line 2533 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = returned_dims; + _tmp4_ = returned_dims; #line 2533 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_.height; + _tmp5_ = _tmp4_.height; #line 2533 "/home/jens/Source/shotwell/src/Photo.vala" - returned_dims.width = _tmp8_; + returned_dims.width = _tmp5_; #line 2534 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = width_tmp; + _tmp6_ = width_tmp; #line 2534 "/home/jens/Source/shotwell/src/Photo.vala" - returned_dims.height = _tmp9_; + returned_dims.height = _tmp6_; #line 2535 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 19635 "Photo.c" +#line 20120 "Photo.c" } default: { #line 2539 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 19641 "Photo.c" +#line 20126 "Photo.c" } } } #line 2544 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = disallowed_steps; -#line 2544 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_STRAIGHTEN); -#line 2544 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 19651 "Photo.c" + if (photo_exception_allows (disallowed_steps, PHOTO_EXCEPTION_STRAIGHTEN)) { +#line 20132 "Photo.c" gdouble x_size = 0.0; gdouble y_size = 0.0; gdouble angle = 0.0; - gdouble _tmp12_ = 0.0; - Dimensions _tmp13_; - gint _tmp14_; - Dimensions _tmp15_; - gint _tmp16_; - gdouble _tmp17_; - gdouble _tmp18_ = 0.0; - gdouble _tmp19_ = 0.0; - gdouble _tmp20_; - gdouble _tmp21_; + gdouble _tmp7_ = 0.0; + Dimensions _tmp8_; + gint _tmp9_; + Dimensions _tmp10_; + gint _tmp11_; + gdouble _tmp12_; + gdouble _tmp13_ = 0.0; + gdouble _tmp14_ = 0.0; + gdouble _tmp15_; + gdouble _tmp16_; #line 2546 "/home/jens/Source/shotwell/src/Photo.vala" angle = 0.0; #line 2548 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_straighten (self, &_tmp12_); + photo_get_straighten (self, &_tmp7_); #line 2548 "/home/jens/Source/shotwell/src/Photo.vala" - angle = _tmp12_; + angle = _tmp7_; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = returned_dims; + _tmp8_ = returned_dims; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_.width; + _tmp9_ = _tmp8_.width; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = returned_dims; + _tmp10_ = returned_dims; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_.height; + _tmp11_ = _tmp10_.height; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = angle; + _tmp12_ = angle; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - compute_arb_rotated_size ((gdouble) _tmp14_, (gdouble) _tmp16_, _tmp17_, &_tmp18_, &_tmp19_); + compute_arb_rotated_size ((gdouble) _tmp9_, (gdouble) _tmp11_, _tmp12_, &_tmp13_, &_tmp14_); #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - x_size = _tmp18_; + x_size = _tmp13_; #line 2550 "/home/jens/Source/shotwell/src/Photo.vala" - y_size = _tmp19_; + y_size = _tmp14_; #line 2552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = x_size; + _tmp15_ = x_size; #line 2552 "/home/jens/Source/shotwell/src/Photo.vala" - returned_dims.width = (gint) _tmp20_; + returned_dims.width = (gint) _tmp15_; #line 2553 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = y_size; + _tmp16_ = y_size; #line 2553 "/home/jens/Source/shotwell/src/Photo.vala" - returned_dims.height = (gint) _tmp21_; -#line 19695 "Photo.c" + returned_dims.height = (gint) _tmp16_; +#line 20176 "Photo.c" } #line 2557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = disallowed_steps; -#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo_exception_allows (_tmp22_, PHOTO_EXCEPTION_CROP); -#line 2557 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp23_) { -#line 19703 "Photo.c" + if (photo_exception_allows (disallowed_steps, PHOTO_EXCEPTION_CROP)) { +#line 20180 "Photo.c" Box crop = {0}; - PhotoException _tmp24_; - Box _tmp25_ = {0}; - gboolean _tmp26_; -#line 2559 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = disallowed_steps; + Box _tmp17_ = {0}; + gboolean _tmp18_; #line 2559 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_get_crop (self, &_tmp25_, _tmp24_); + _tmp18_ = photo_get_crop (self, &_tmp17_, disallowed_steps); #line 2559 "/home/jens/Source/shotwell/src/Photo.vala" - crop = _tmp25_; + crop = _tmp17_; #line 2559 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp26_) { -#line 19716 "Photo.c" - Dimensions _tmp27_ = {0}; + if (_tmp18_) { +#line 20190 "Photo.c" + Dimensions _tmp19_ = {0}; #line 2560 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_dimensions (&crop, &_tmp27_); + box_get_dimensions (&crop, &_tmp19_); #line 2560 "/home/jens/Source/shotwell/src/Photo.vala" - returned_dims = _tmp27_; -#line 19722 "Photo.c" + returned_dims = _tmp19_; +#line 20196 "Photo.c" } } #line 2563 "/home/jens/Source/shotwell/src/Photo.vala" *result = returned_dims; #line 2563 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 19729 "Photo.c" +#line 20203 "Photo.c" } -static void photo_locked_create_adjustments_from_data (Photo* self) { +static void +photo_locked_create_adjustments_from_data (Photo* self) +{ PixelTransformationBundle* _tmp0_; KeyValueMap* map = NULL; KeyValueMap* _tmp1_; @@ -19754,13 +20230,13 @@ static void photo_locked_create_adjustments_from_data (Photo* self) { _tmp2_ = map; #line 2571 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 19756 "Photo.c" +#line 20232 "Photo.c" PixelTransformationBundle* _tmp3_; #line 2572 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->priv->adjustments; #line 2572 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformation_bundle_set_to_identity (_tmp3_); -#line 19762 "Photo.c" +#line 20238 "Photo.c" } else { PixelTransformationBundle* _tmp4_; KeyValueMap* _tmp5_; @@ -19770,7 +20246,7 @@ static void photo_locked_create_adjustments_from_data (Photo* self) { _tmp5_ = map; #line 2574 "/home/jens/Source/shotwell/src/Photo.vala" pixel_transformation_bundle_load (_tmp4_, _tmp5_); -#line 19772 "Photo.c" +#line 20248 "Photo.c" } #line 2576 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->adjustments; @@ -19782,23 +20258,25 @@ static void photo_locked_create_adjustments_from_data (Photo* self) { self->priv->transformer = _tmp7_; #line 2567 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 19784 "Photo.c" +#line 20260 "Photo.c" } -PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { +PixelTransformationBundle* +photo_get_color_adjustments (Photo* self) +{ PixelTransformationBundle* result = NULL; GError * _inner_error_ = NULL; #line 2580 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 19793 "Photo.c" +#line 20271 "Photo.c" { PhotoRow* _tmp0_; #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19800 "Photo.c" +#line 20278 "Photo.c" { PixelTransformationBundle* _tmp1_; PixelTransformationBundle* _tmp2_; @@ -19809,7 +20287,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { if (_tmp1_ == NULL) { #line 2583 "/home/jens/Source/shotwell/src/Photo.vala" photo_locked_create_adjustments_from_data (self); -#line 19811 "Photo.c" +#line 20289 "Photo.c" } #line 2585 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->adjustments; @@ -19817,18 +20295,18 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { _tmp3_ = pixel_transformation_bundle_copy (_tmp2_); #line 2585 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 19819 "Photo.c" +#line 20297 "Photo.c" { PhotoRow* _tmp4_; #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19826 "Photo.c" +#line 20304 "Photo.c" } #line 2585 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19830 "Photo.c" +#line 20308 "Photo.c" } __finally371: { @@ -19837,7 +20315,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { _tmp5_ = self->row; #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19839 "Photo.c" +#line 20317 "Photo.c" } #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -19845,24 +20323,26 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) { g_clear_error (&_inner_error_); #line 2581 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 19847 "Photo.c" +#line 20325 "Photo.c" } } -PixelTransformer* photo_get_pixel_transformer (Photo* self) { +PixelTransformer* +photo_get_pixel_transformer (Photo* self) +{ PixelTransformer* result = NULL; GError * _inner_error_ = NULL; #line 2589 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 19857 "Photo.c" +#line 20337 "Photo.c" { PhotoRow* _tmp0_; #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19864 "Photo.c" +#line 20344 "Photo.c" { PixelTransformer* _tmp1_; PixelTransformer* _tmp2_; @@ -19873,7 +20353,7 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { if (_tmp1_ == NULL) { #line 2592 "/home/jens/Source/shotwell/src/Photo.vala" photo_locked_create_adjustments_from_data (self); -#line 19875 "Photo.c" +#line 20355 "Photo.c" } #line 2594 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->transformer; @@ -19881,18 +20361,18 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { _tmp3_ = pixel_transformer_copy (_tmp2_); #line 2594 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; -#line 19883 "Photo.c" +#line 20363 "Photo.c" { PhotoRow* _tmp4_; #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19890 "Photo.c" +#line 20370 "Photo.c" } #line 2594 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19894 "Photo.c" +#line 20374 "Photo.c" } __finally372: { @@ -19901,7 +20381,7 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { _tmp5_ = self->row; #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 19903 "Photo.c" +#line 20383 "Photo.c" } #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -19909,33 +20389,34 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) { g_clear_error (&_inner_error_); #line 2590 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 19911 "Photo.c" +#line 20391 "Photo.c" } } -gboolean photo_has_color_adjustments (Photo* self) { +gboolean +photo_has_color_adjustments (Photo* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 2598 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_has_transformation (self, "adjustments"); -#line 2599 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_has_transformation (self, "adjustments"); #line 2599 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19927 "Photo.c" +#line 20406 "Photo.c" } -PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformationType type) { +PixelTransformation* +photo_get_color_adjustment (Photo* self, + PixelTransformationType type) +{ PixelTransformation* result = NULL; PixelTransformationBundle* _tmp0_; PixelTransformationBundle* _tmp1_; - PixelTransformationType _tmp2_; + PixelTransformation* _tmp2_; PixelTransformation* _tmp3_; - PixelTransformation* _tmp4_; #line 2602 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" @@ -19943,56 +20424,47 @@ PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformatio #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = type; + _tmp2_ = pixel_transformation_bundle_get_transformation (_tmp1_, type); #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = pixel_transformation_bundle_get_transformation (_tmp1_, _tmp2_); -#line 2603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp1_); #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 2603 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 19956 "Photo.c" +#line 20435 "Photo.c" } -void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_adjustments) { - PixelTransformationBundle* _tmp0_; - gboolean _tmp1_; +void +photo_set_color_adjustments (Photo* self, + PixelTransformationBundle* new_adjustments) +{ KeyValueMap* map = NULL; - PixelTransformationBundle* _tmp8_; - KeyValueMap* _tmp9_; + KeyValueMap* _tmp5_; gboolean committed = FALSE; - gboolean _tmp39_; + gboolean _tmp28_; GError * _inner_error_ = NULL; #line 2606 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2606 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_adjustments)); #line 2609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = new_adjustments; -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = pixel_transformation_bundle_is_identity (_tmp0_); -#line 2609 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { -#line 19979 "Photo.c" + if (pixel_transformation_bundle_is_identity (new_adjustments)) { +#line 20454 "Photo.c" gboolean _result_ = FALSE; - gboolean _tmp5_; + gboolean _tmp2_; { - PhotoRow* _tmp2_; + PhotoRow* _tmp0_; #line 2611 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = self->row; + _tmp0_ = self->row; #line 2611 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 19988 "Photo.c" +#line 20463 "Photo.c" { - gboolean _tmp3_; -#line 2612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_remove_transformation (self, "adjustments"); #line 2612 "/home/jens/Source/shotwell/src/Photo.vala" - _result_ = _tmp3_; + _result_ = photo_remove_transformation (self, "adjustments"); #line 2613 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); #line 2613 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20001,16 +20473,16 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad _pixel_transformer_unref0 (self->priv->transformer); #line 2614 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->transformer = NULL; -#line 20003 "Photo.c" +#line 20475 "Photo.c" } __finally373: { - PhotoRow* _tmp4_; + PhotoRow* _tmp1_; #line 2611 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp1_ = self->row; #line 2611 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20012 "Photo.c" +#line 20484 "Photo.c" } #line 2611 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -20020,195 +20492,172 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad g_clear_error (&_inner_error_); #line 2611 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20022 "Photo.c" +#line 20494 "Photo.c" } } #line 2617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _result_; + _tmp2_ = _result_; #line 2617 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 20029 "Photo.c" - Alteration* _tmp6_; - Alteration* _tmp7_; + if (_tmp2_) { +#line 20501 "Photo.c" + Alteration* _tmp3_; + Alteration* _tmp4_; #line 2618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = alteration_new ("image", "color-adjustments"); + _tmp3_ = alteration_new ("image", "color-adjustments"); #line 2618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 2618 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp7_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp4_); #line 2618 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp7_); -#line 20040 "Photo.c" + _alteration_unref0 (_tmp4_); +#line 20512 "Photo.c" } #line 2620 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20044 "Photo.c" +#line 20516 "Photo.c" } #line 2624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = new_adjustments; + _tmp5_ = pixel_transformation_bundle_save (new_adjustments, "adjustments"); #line 2624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = pixel_transformation_bundle_save (_tmp8_, "adjustments"); -#line 2624 "/home/jens/Source/shotwell/src/Photo.vala" - map = _tmp9_; -#line 20052 "Photo.c" + map = _tmp5_; +#line 20522 "Photo.c" { - PhotoRow* _tmp10_; + PhotoRow* _tmp6_; #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->row; + _tmp6_ = self->row; #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20059 "Photo.c" +#line 20529 "Photo.c" { - gboolean _tmp11_ = FALSE; - PixelTransformer* _tmp12_; - KeyValueMap* _tmp36_; - gboolean _tmp37_; + gboolean _tmp7_ = FALSE; + PixelTransformer* _tmp8_; + KeyValueMap* _tmp26_; #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = self->priv->transformer; + _tmp8_ = self->priv->transformer; #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_ == NULL) { + if (_tmp8_ == NULL) { #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = TRUE; -#line 20071 "Photo.c" + _tmp7_ = TRUE; +#line 20540 "Photo.c" } else { - PixelTransformationBundle* _tmp13_; + PixelTransformationBundle* _tmp9_; #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->priv->adjustments; + _tmp9_ = self->priv->adjustments; #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp13_ == NULL; -#line 20078 "Photo.c" + _tmp7_ = _tmp9_ == NULL; +#line 20547 "Photo.c" } #line 2628 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 20082 "Photo.c" - PixelTransformationBundle* _tmp14_; - PixelTransformationBundle* _tmp15_; - PixelTransformationBundle* _tmp16_; - PixelTransformer* _tmp17_; -#line 2630 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = new_adjustments; + if (_tmp7_) { +#line 20551 "Photo.c" + PixelTransformationBundle* _tmp10_; + PixelTransformer* _tmp11_; #line 2630 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = pixel_transformation_bundle_copy (_tmp14_); + _tmp10_ = pixel_transformation_bundle_copy (new_adjustments); #line 2630 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); #line 2630 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->adjustments = _tmp15_; -#line 2631 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = new_adjustments; + self->priv->adjustments = _tmp10_; #line 2631 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = pixel_transformation_bundle_generate_transformer (_tmp16_); + _tmp11_ = pixel_transformation_bundle_generate_transformer (new_adjustments); #line 2631 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); #line 2631 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->transformer = _tmp17_; -#line 20103 "Photo.c" + self->priv->transformer = _tmp11_; +#line 20566 "Photo.c" } else { - PixelTransformationBundle* _tmp34_; - PixelTransformationBundle* _tmp35_; + PixelTransformationBundle* _tmp25_; { GeeIterator* _transformation_it = NULL; - PixelTransformationBundle* _tmp18_; - GeeIterable* _tmp19_; - GeeIterable* _tmp20_; - GeeIterator* _tmp21_; - GeeIterator* _tmp22_; + GeeIterable* _tmp12_; + GeeIterable* _tmp13_; + GeeIterator* _tmp14_; + GeeIterator* _tmp15_; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = new_adjustments; + _tmp12_ = pixel_transformation_bundle_get_transformations (new_adjustments); #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = pixel_transformation_bundle_get_transformations (_tmp18_); + _tmp13_ = _tmp12_; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp14_ = gee_iterable_iterator (_tmp13_); #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = gee_iterable_iterator (_tmp20_); + _tmp15_ = _tmp14_; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_; + _g_object_unref0 (_tmp13_); #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp20_); -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _transformation_it = _tmp22_; + _transformation_it = _tmp15_; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 20130 "Photo.c" - GeeIterator* _tmp23_; - gboolean _tmp24_; +#line 20589 "Photo.c" + GeeIterator* _tmp16_; PixelTransformation* transformation = NULL; - GeeIterator* _tmp25_; - gpointer _tmp26_; - PixelTransformer* _tmp27_; - PixelTransformationBundle* _tmp28_; - PixelTransformation* _tmp29_; - PixelTransformationType _tmp30_; - PixelTransformation* _tmp31_; - PixelTransformation* _tmp32_; - PixelTransformation* _tmp33_; -#line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _transformation_it; + GeeIterator* _tmp17_; + gpointer _tmp18_; + PixelTransformer* _tmp19_; + PixelTransformationBundle* _tmp20_; + PixelTransformation* _tmp21_; + PixelTransformation* _tmp22_; + PixelTransformation* _tmp23_; + PixelTransformation* _tmp24_; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = gee_iterator_next (_tmp23_); + _tmp16_ = _transformation_it; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp24_) { + if (!gee_iterator_next (_tmp16_)) { #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 20151 "Photo.c" +#line 20606 "Photo.c" } #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _transformation_it; + _tmp17_ = _transformation_it; #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = gee_iterator_get (_tmp25_); + _tmp18_ = gee_iterator_get (_tmp17_); #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" - transformation = (PixelTransformation*) _tmp26_; -#line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = self->priv->transformer; + transformation = (PixelTransformation*) _tmp18_; #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = self->priv->adjustments; + _tmp19_ = self->priv->transformer; #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = transformation; + _tmp20_ = self->priv->adjustments; #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = pixel_transformation_get_transformation_type (_tmp29_); + _tmp21_ = transformation; #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = pixel_transformation_bundle_get_transformation (_tmp28_, _tmp30_); + _tmp22_ = pixel_transformation_bundle_get_transformation (_tmp20_, pixel_transformation_get_transformation_type (_tmp21_)); #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_; + _tmp23_ = _tmp22_; #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = transformation; + _tmp24_ = transformation; #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - pixel_transformer_replace_transformation (_tmp27_, _tmp32_, _tmp33_); + pixel_transformer_replace_transformation (_tmp19_, _tmp23_, _tmp24_); #line 2635 "/home/jens/Source/shotwell/src/Photo.vala" - _pixel_transformation_unref0 (_tmp32_); + _pixel_transformation_unref0 (_tmp23_); #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_unref0 (transformation); -#line 20179 "Photo.c" +#line 20632 "Photo.c" } #line 2634 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_transformation_it); -#line 20183 "Photo.c" +#line 20636 "Photo.c" } #line 2640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = new_adjustments; -#line 2640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = pixel_transformation_bundle_copy (_tmp34_); + _tmp25_ = pixel_transformation_bundle_copy (new_adjustments); #line 2640 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); #line 2640 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->adjustments = _tmp35_; -#line 20193 "Photo.c" + self->priv->adjustments = _tmp25_; +#line 20644 "Photo.c" } #line 2643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = map; + _tmp26_ = map; #line 2643 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = photo_set_transformation (self, _tmp36_); -#line 2643 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp37_; -#line 20201 "Photo.c" + committed = photo_set_transformation (self, _tmp26_); +#line 20650 "Photo.c" } __finally374: { - PhotoRow* _tmp38_; + PhotoRow* _tmp27_; #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = self->row; + _tmp27_ = self->row; #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20210 "Photo.c" +#line 20659 "Photo.c" } #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -20220,39 +20669,41 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad g_clear_error (&_inner_error_); #line 2627 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20222 "Photo.c" +#line 20671 "Photo.c" } } #line 2646 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = committed; + _tmp28_ = committed; #line 2646 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp39_) { -#line 20229 "Photo.c" - Alteration* _tmp40_; - Alteration* _tmp41_; + if (_tmp28_) { +#line 20678 "Photo.c" + Alteration* _tmp29_; + Alteration* _tmp30_; #line 2647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = alteration_new ("image", "color-adjustments"); + _tmp29_ = alteration_new ("image", "color-adjustments"); #line 2647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_; + _tmp30_ = _tmp29_; #line 2647 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp41_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp30_); #line 2647 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp41_); -#line 20240 "Photo.c" + _alteration_unref0 (_tmp30_); +#line 20689 "Photo.c" } #line 2606 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 20244 "Photo.c" +#line 20693 "Photo.c" } -static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { +static PhotoMetadata* +photo_real_get_metadata (PhotoSource* base) +{ Photo * self; PhotoMetadata* result = NULL; GError * _inner_error_ = NULL; #line 2651 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo); -#line 20254 "Photo.c" +#line 20705 "Photo.c" { PhotoMetadata* _tmp0_ = NULL; PhotoFileReader* _tmp1_; @@ -20274,7 +20725,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { _tmp0_ = _tmp4_; #line 2653 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20276 "Photo.c" +#line 20727 "Photo.c" goto __catch375_g_error; } #line 2653 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20287,7 +20738,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { _media_metadata_unref0 (_tmp0_); #line 2653 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20289 "Photo.c" +#line 20740 "Photo.c" } goto __finally375; __catch375_g_error: @@ -20311,7 +20762,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { _g_error_free0 (err); #line 2657 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20313 "Photo.c" +#line 20764 "Photo.c" } __finally375: #line 2652 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20320,11 +20771,14 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) { g_clear_error (&_inner_error_); #line 2652 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20322 "Photo.c" +#line 20773 "Photo.c" } -PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) { +PhotoMetadata* +photo_get_master_metadata (Photo* self, + GError** error) +{ PhotoMetadata* result = NULL; PhotoMetadata* _tmp0_ = NULL; PhotoFileReader* _tmp1_; @@ -20353,7 +20807,7 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 2662 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20355 "Photo.c" +#line 20809 "Photo.c" } #line 2662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp0_; @@ -20365,11 +20819,14 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) { _media_metadata_unref0 (_tmp0_); #line 2662 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20367 "Photo.c" +#line 20821 "Photo.c" } -PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) { +PhotoMetadata* +photo_get_editable_metadata (Photo* self, + GError** error) +{ PhotoMetadata* result = NULL; PhotoFileReader* reader = NULL; PhotoFileReader* _tmp0_; @@ -20386,7 +20843,7 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) { _tmp2_ = reader; #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 20388 "Photo.c" +#line 20845 "Photo.c" PhotoFileReader* _tmp3_; PhotoMetadata* _tmp4_; #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20407,14 +20864,14 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) { _photo_file_adapter_unref0 (reader); #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 20409 "Photo.c" +#line 20866 "Photo.c" } } else { #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (_tmp1_); #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 20416 "Photo.c" +#line 20873 "Photo.c" } #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; @@ -20422,26 +20879,28 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) { _photo_file_adapter_unref0 (reader); #line 2668 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20424 "Photo.c" +#line 20881 "Photo.c" } -gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState* * state, GError** error) { +gboolean +photo_persist_master_metadata (Photo* self, + PhotoMetadata* metadata, + PhotoReimportMasterState* * state, + GError** error) +{ PhotoReimportMasterState* _vala_state = NULL; gboolean result = FALSE; PhotoFileReader* master_reader = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; - PhotoFileFormat _tmp2_; - gboolean _tmp3_; - PhotoFileMetadataWriter* _tmp4_ = NULL; - PhotoFileReader* _tmp5_; - PhotoFileMetadataWriter* _tmp6_; - PhotoMetadata* _tmp8_; - gboolean _tmp10_ = FALSE; - PhotoReimportMasterState* _tmp11_ = NULL; - gboolean _tmp12_; - PhotoReimportMasterState* _tmp14_; + PhotoFileMetadataWriter* _tmp2_ = NULL; + PhotoFileReader* _tmp3_; + PhotoFileMetadataWriter* _tmp4_; + gboolean _tmp7_ = FALSE; + PhotoReimportMasterState* _tmp8_ = NULL; + gboolean _tmp9_; + PhotoReimportMasterState* _tmp11_; GError * _inner_error_ = NULL; #line 2674 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -20458,11 +20917,7 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph #line 2680 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = master_reader; #line 2680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_format_can_write_metadata (_tmp2_); -#line 2680 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { + if (!photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)))) { #line 2681 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2681 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20471,133 +20926,132 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph if (state) { #line 2681 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20473 "Photo.c" +#line 20928 "Photo.c" } else { #line 2681 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20477 "Photo.c" +#line 20932 "Photo.c" } #line 2681 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20481 "Photo.c" +#line 20936 "Photo.c" } #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = master_reader; + _tmp3_ = master_reader; #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_reader_create_metadata_writer (_tmp5_, &_inner_error_); + _tmp4_ = photo_file_reader_create_metadata_writer (_tmp3_, &_inner_error_); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp6_; + _tmp2_ = _tmp4_; #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20491 "Photo.c" - gboolean _tmp7_ = FALSE; +#line 20946 "Photo.c" + gboolean _tmp5_ = FALSE; #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp7_; -#line 20499 "Photo.c" + return _tmp5_; +#line 20954 "Photo.c" } #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = metadata; -#line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp4_, _tmp8_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp2_, metadata, &_inner_error_); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20507 "Photo.c" - gboolean _tmp9_ = FALSE; +#line 20960 "Photo.c" + gboolean _tmp6_ = FALSE; #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp4_); + _photo_file_adapter_unref0 (_tmp2_); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); #line 2683 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp9_; -#line 20517 "Photo.c" + return _tmp6_; +#line 20970 "Photo.c" } #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_prepare_for_reimport_master (self, &_tmp11_, &_inner_error_); + _tmp9_ = photo_prepare_for_reimport_master (self, &_tmp8_, &_inner_error_); #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = _tmp11_; + _vala_state = _tmp8_; #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp12_; + _tmp7_ = _tmp9_; #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20529 "Photo.c" - gboolean _tmp13_ = FALSE; +#line 20982 "Photo.c" + gboolean _tmp10_ = FALSE; #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp4_); + _photo_file_adapter_unref0 (_tmp2_); #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp13_; -#line 20539 "Photo.c" + return _tmp10_; +#line 20992 "Photo.c" } #line 2685 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp10_) { + if (!_tmp7_) { #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp4_); + _photo_file_adapter_unref0 (_tmp2_); #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20553 "Photo.c" +#line 21006 "Photo.c" } else { #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20557 "Photo.c" +#line 21010 "Photo.c" } #line 2686 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20561 "Photo.c" +#line 21014 "Photo.c" } #line 2688 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _vala_state; + _tmp11_ = _vala_state; #line 2688 "/home/jens/Source/shotwell/src/Photo.vala" - G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE; + G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE; #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp4_); + _photo_file_adapter_unref0 (_tmp2_); #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (master_reader); #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20577 "Photo.c" +#line 21030 "Photo.c" } else { #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_master_state_unref0 (_vala_state); -#line 20581 "Photo.c" +#line 21034 "Photo.c" } #line 2690 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20585 "Photo.c" +#line 21038 "Photo.c" } -void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error) { - PhotoReimportMasterState* _tmp0_; +void +photo_finish_update_master_metadata (Photo* self, + PhotoReimportMasterState* state, + GError** error) +{ GError * _inner_error_ = NULL; #line 2693 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2693 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state)); #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = state; -#line 2694 "/home/jens/Source/shotwell/src/Photo.vala" - photo_finish_reimport_master (self, _tmp0_, &_inner_error_); + photo_finish_reimport_master (self, state, &_inner_error_); #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20606,7 +21060,7 @@ void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* g_propagate_error (error, _inner_error_); #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20608 "Photo.c" +#line 21062 "Photo.c" } else { #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -20614,29 +21068,31 @@ void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* g_clear_error (&_inner_error_); #line 2694 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20616 "Photo.c" +#line 21070 "Photo.c" } } } -gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState* * state, GError** error) { +gboolean +photo_persist_editable_metadata (Photo* self, + PhotoMetadata* metadata, + PhotoReimportEditableState* * state, + GError** error) +{ PhotoReimportEditableState* _vala_state = NULL; gboolean result = FALSE; PhotoFileReader* editable_reader = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; PhotoFileReader* _tmp2_; - PhotoFileFormat _tmp3_; - gboolean _tmp4_; - PhotoFileMetadataWriter* _tmp5_ = NULL; - PhotoFileReader* _tmp6_; - PhotoFileMetadataWriter* _tmp7_; - PhotoMetadata* _tmp9_; - gboolean _tmp11_ = FALSE; - PhotoReimportEditableState* _tmp12_ = NULL; - gboolean _tmp13_; - PhotoReimportEditableState* _tmp15_; + PhotoFileMetadataWriter* _tmp3_ = NULL; + PhotoFileReader* _tmp4_; + PhotoFileMetadataWriter* _tmp5_; + gboolean _tmp8_ = FALSE; + PhotoReimportEditableState* _tmp9_ = NULL; + gboolean _tmp10_; + PhotoReimportEditableState* _tmp12_; GError * _inner_error_ = NULL; #line 2697 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -20662,24 +21118,20 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, if (state) { #line 2703 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20664 "Photo.c" +#line 21120 "Photo.c" } else { #line 2703 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20668 "Photo.c" +#line 21124 "Photo.c" } #line 2703 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20672 "Photo.c" +#line 21128 "Photo.c" } #line 2705 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = editable_reader; #line 2705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_file_format_can_write_metadata (_tmp3_); -#line 2705 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp4_) { + if (!photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)))) { #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20688,133 +21140,132 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, if (state) { #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20690 "Photo.c" +#line 21142 "Photo.c" } else { #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20694 "Photo.c" +#line 21146 "Photo.c" } #line 2706 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20698 "Photo.c" +#line 21150 "Photo.c" } #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = editable_reader; + _tmp4_ = editable_reader; #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_file_reader_create_metadata_writer (_tmp6_, &_inner_error_); + _tmp5_ = photo_file_reader_create_metadata_writer (_tmp4_, &_inner_error_); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp7_; + _tmp3_ = _tmp5_; #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20708 "Photo.c" - gboolean _tmp8_ = FALSE; +#line 21160 "Photo.c" + gboolean _tmp6_ = FALSE; #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp8_; -#line 20716 "Photo.c" + return _tmp6_; +#line 21168 "Photo.c" } #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = metadata; -#line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp5_, _tmp9_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp3_, metadata, &_inner_error_); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20724 "Photo.c" - gboolean _tmp10_ = FALSE; +#line 21174 "Photo.c" + gboolean _tmp7_ = FALSE; #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp5_); + _photo_file_adapter_unref0 (_tmp3_); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); #line 2708 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp10_; -#line 20734 "Photo.c" + return _tmp7_; +#line 21184 "Photo.c" } #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_prepare_for_reimport_editable (self, &_tmp12_, &_inner_error_); + _tmp10_ = photo_prepare_for_reimport_editable (self, &_tmp9_, &_inner_error_); #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_state = _tmp12_; + _vala_state = _tmp9_; #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp13_; + _tmp8_ = _tmp10_; #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 20746 "Photo.c" - gboolean _tmp14_ = FALSE; +#line 21196 "Photo.c" + gboolean _tmp11_ = FALSE; #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp5_); + _photo_file_adapter_unref0 (_tmp3_); #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp14_; -#line 20756 "Photo.c" + return _tmp11_; +#line 21206 "Photo.c" } #line 2710 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp11_) { + if (!_tmp8_) { #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp5_); + _photo_file_adapter_unref0 (_tmp3_); #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20770 "Photo.c" +#line 21220 "Photo.c" } else { #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20774 "Photo.c" +#line 21224 "Photo.c" } #line 2711 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20778 "Photo.c" +#line 21228 "Photo.c" } #line 2713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _vala_state; + _tmp12_ = _vala_state; #line 2713 "/home/jens/Source/shotwell/src/Photo.vala" - G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE; + G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE; #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp5_); + _photo_file_adapter_unref0 (_tmp3_); #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (editable_reader); #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" if (state) { #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 20794 "Photo.c" +#line 21244 "Photo.c" } else { #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" _photo_reimport_editable_state_unref0 (_vala_state); -#line 20798 "Photo.c" +#line 21248 "Photo.c" } #line 2715 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20802 "Photo.c" +#line 21252 "Photo.c" } -void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error) { - PhotoReimportEditableState* _tmp0_; +void +photo_finish_update_editable_metadata (Photo* self, + PhotoReimportEditableState* state, + GError** error) +{ GError * _inner_error_ = NULL; #line 2718 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2718 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_EDITABLE_STATE (state)); #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = state; -#line 2719 "/home/jens/Source/shotwell/src/Photo.vala" - photo_finish_reimport_editable (self, _tmp0_, &_inner_error_); + photo_finish_reimport_editable (self, state, &_inner_error_); #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" @@ -20823,7 +21274,7 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt g_propagate_error (error, _inner_error_); #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20825 "Photo.c" +#line 21276 "Photo.c" } else { #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -20831,24 +21282,27 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt g_clear_error (&_inner_error_); #line 2719 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20833 "Photo.c" +#line 21284 "Photo.c" } } } -void photo_get_raw_dimensions (Photo* self, Dimensions* result) { +void +photo_get_raw_dimensions (Photo* self, + Dimensions* result) +{ GError * _inner_error_ = NULL; #line 2724 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 20843 "Photo.c" +#line 21297 "Photo.c" { PhotoRow* _tmp0_; #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20850 "Photo.c" +#line 21304 "Photo.c" { BackingPhotoRow* _tmp1_; Dimensions _tmp2_; @@ -20858,18 +21312,18 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) { _tmp2_ = _tmp1_->dim; #line 2726 "/home/jens/Source/shotwell/src/Photo.vala" *result = _tmp2_; -#line 20860 "Photo.c" +#line 21314 "Photo.c" { PhotoRow* _tmp3_; #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20867 "Photo.c" +#line 21321 "Photo.c" } #line 2726 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20871 "Photo.c" +#line 21325 "Photo.c" } __finally376: { @@ -20878,7 +21332,7 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) { _tmp4_ = self->row; #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20880 "Photo.c" +#line 21334 "Photo.c" } #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -20886,17 +21340,19 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) { g_clear_error (&_inner_error_); #line 2725 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 20888 "Photo.c" +#line 21342 "Photo.c" } } -gboolean photo_has_transformations (Photo* self) { +gboolean +photo_has_transformations (Photo* self) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 2730 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); -#line 20898 "Photo.c" +#line 21354 "Photo.c" { PhotoRow* _tmp0_; gboolean _tmp10_ = FALSE; @@ -20904,7 +21360,7 @@ gboolean photo_has_transformations (Photo* self) { _tmp0_ = self->row; #line 2731 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 20906 "Photo.c" +#line 21362 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoRow* _tmp2_; @@ -20923,7 +21379,7 @@ gboolean photo_has_transformations (Photo* self) { if (_tmp3_ != _tmp5_) { #line 2733 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = TRUE; -#line 20925 "Photo.c" +#line 21381 "Photo.c" } else { PhotoRow* _tmp6_; GeeHashMap* _tmp7_; @@ -20933,22 +21389,22 @@ gboolean photo_has_transformations (Photo* self) { _tmp7_ = _tmp6_->transformations; #line 2734 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp7_ != NULL; -#line 20935 "Photo.c" +#line 21391 "Photo.c" } #line 2732 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 20939 "Photo.c" +#line 21395 "Photo.c" { PhotoRow* _tmp8_; #line 2731 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = self->row; #line 2731 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20946 "Photo.c" +#line 21402 "Photo.c" } #line 2732 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 20950 "Photo.c" +#line 21406 "Photo.c" } __finally377: { @@ -20957,7 +21413,7 @@ gboolean photo_has_transformations (Photo* self) { _tmp9_ = self->row; #line 2731 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 20959 "Photo.c" +#line 21415 "Photo.c" } #line 2731 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -20965,12 +21421,14 @@ gboolean photo_has_transformations (Photo* self) { g_clear_error (&_inner_error_); #line 2731 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp10_; -#line 20967 "Photo.c" +#line 21423 "Photo.c" } } -gboolean photo_only_metadata_changed (Photo* self) { +gboolean +photo_only_metadata_changed (Photo* self) +{ gboolean result = FALSE; MetadataDateTime* date_time = NULL; PhotoMetadata* metadata = NULL; @@ -20989,7 +21447,7 @@ gboolean photo_only_metadata_changed (Photo* self) { _tmp1_ = metadata; #line 2742 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 20991 "Photo.c" +#line 21449 "Photo.c" PhotoMetadata* _tmp2_; MetadataDateTime* _tmp3_; #line 2743 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21000,16 +21458,16 @@ gboolean photo_only_metadata_changed (Photo* self) { _metadata_date_time_unref0 (date_time); #line 2743 "/home/jens/Source/shotwell/src/Photo.vala" date_time = _tmp3_; -#line 21002 "Photo.c" +#line 21460 "Photo.c" } { PhotoRow* _tmp4_; - gboolean _tmp21_ = FALSE; + gboolean _tmp20_ = FALSE; #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21011 "Photo.c" +#line 21469 "Photo.c" { gboolean _tmp5_ = FALSE; PhotoRow* _tmp6_; @@ -21020,7 +21478,7 @@ gboolean photo_only_metadata_changed (Photo* self) { _tmp7_ = _tmp6_->transformations; #line 2746 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp7_ == NULL) { -#line 21022 "Photo.c" +#line 21480 "Photo.c" gboolean _tmp8_ = FALSE; PhotoRow* _tmp9_; Orientation _tmp10_; @@ -21038,7 +21496,7 @@ gboolean photo_only_metadata_changed (Photo* self) { if (_tmp10_ != _tmp12_) { #line 2747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = TRUE; -#line 21040 "Photo.c" +#line 21498 "Photo.c" } else { gboolean _tmp13_ = FALSE; MetadataDateTime* _tmp14_; @@ -21046,11 +21504,10 @@ gboolean photo_only_metadata_changed (Photo* self) { _tmp14_ = date_time; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp14_ != NULL) { -#line 21048 "Photo.c" +#line 21506 "Photo.c" PhotoRow* _tmp15_; time_t _tmp16_; MetadataDateTime* _tmp17_; - time_t _tmp18_; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = self->row; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21058,37 +21515,35 @@ gboolean photo_only_metadata_changed (Photo* self) { #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = date_time; #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = metadata_date_time_get_timestamp (_tmp17_); -#line 2748 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp16_ != _tmp18_; -#line 21063 "Photo.c" + _tmp13_ = _tmp16_ != metadata_date_time_get_timestamp (_tmp17_); +#line 21518 "Photo.c" } else { #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = FALSE; -#line 21067 "Photo.c" +#line 21522 "Photo.c" } #line 2748 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = _tmp13_; -#line 21071 "Photo.c" +#line 21526 "Photo.c" } #line 2747 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp8_; -#line 21075 "Photo.c" +#line 21530 "Photo.c" } else { #line 2746 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = FALSE; -#line 21079 "Photo.c" +#line 21534 "Photo.c" } #line 2746 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp5_; -#line 21083 "Photo.c" +#line 21538 "Photo.c" { - PhotoRow* _tmp19_; + PhotoRow* _tmp18_; #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp18_ = self->row; #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21090 "Photo.c" +#line 21545 "Photo.c" } #line 2746 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21096,16 +21551,16 @@ gboolean photo_only_metadata_changed (Photo* self) { _metadata_date_time_unref0 (date_time); #line 2746 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21098 "Photo.c" +#line 21553 "Photo.c" } __finally378: { - PhotoRow* _tmp20_; + PhotoRow* _tmp19_; #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->row; + _tmp19_ = self->row; #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21107 "Photo.c" +#line 21562 "Photo.c" } #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21116,18 +21571,20 @@ gboolean photo_only_metadata_changed (Photo* self) { #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2745 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp21_; -#line 21119 "Photo.c" + return _tmp20_; +#line 21574 "Photo.c" } #line 2738 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); #line 2738 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 21125 "Photo.c" +#line 21580 "Photo.c" } -gboolean photo_has_alterations (Photo* self) { +gboolean +photo_has_alterations (Photo* self) +{ gboolean result = FALSE; MetadataDateTime* date_time = NULL; gchar* title = NULL; @@ -21153,7 +21610,7 @@ gboolean photo_has_alterations (Photo* self) { _tmp1_ = metadata; #line 2758 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ != NULL) { -#line 21155 "Photo.c" +#line 21612 "Photo.c" PhotoMetadata* _tmp2_; MetadataDateTime* _tmp3_; PhotoMetadata* _tmp4_; @@ -21184,20 +21641,20 @@ gboolean photo_has_alterations (Photo* self) { _g_free0 (comment); #line 2761 "/home/jens/Source/shotwell/src/Photo.vala" comment = _tmp7_; -#line 21186 "Photo.c" +#line 21643 "Photo.c" } #line 2765 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = date_time; #line 2765 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_ == NULL) { -#line 21192 "Photo.c" +#line 21649 "Photo.c" { PhotoRow* _tmp9_; #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21199 "Photo.c" +#line 21656 "Photo.c" { BackingPhotoRow* _tmp10_; time_t _tmp11_; @@ -21215,14 +21672,14 @@ gboolean photo_has_alterations (Photo* self) { if (_tmp11_ != _tmp13_) { #line 2771 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; -#line 21217 "Photo.c" +#line 21674 "Photo.c" { PhotoRow* _tmp14_; #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21224 "Photo.c" +#line 21681 "Photo.c" } #line 2771 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21234,7 +21691,7 @@ gboolean photo_has_alterations (Photo* self) { _metadata_date_time_unref0 (date_time); #line 2771 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21236 "Photo.c" +#line 21693 "Photo.c" } } __finally379: @@ -21244,11 +21701,11 @@ gboolean photo_has_alterations (Photo* self) { _tmp15_ = self->row; #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21246 "Photo.c" +#line 21703 "Photo.c" } #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 21250 "Photo.c" +#line 21707 "Photo.c" gboolean _tmp16_ = FALSE; #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21264,18 +21721,18 @@ gboolean photo_has_alterations (Photo* self) { g_clear_error (&_inner_error_); #line 2767 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp16_; -#line 21266 "Photo.c" +#line 21723 "Photo.c" } } } { PhotoRow* _tmp17_; - gboolean _tmp42_ = FALSE; + gboolean _tmp41_ = FALSE; #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" _tmp17_ = self->row; #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21277 "Photo.c" +#line 21734 "Photo.c" { gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; @@ -21291,7 +21748,7 @@ gboolean photo_has_alterations (Photo* self) { if (_tmp23_ != NULL) { #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = TRUE; -#line 21293 "Photo.c" +#line 21750 "Photo.c" } else { PhotoRow* _tmp24_; Orientation _tmp25_; @@ -21307,13 +21764,13 @@ gboolean photo_has_alterations (Photo* self) { _tmp27_ = _tmp26_->original_orientation; #line 2778 "/home/jens/Source/shotwell/src/Photo.vala" _tmp21_ = _tmp25_ != _tmp27_; -#line 21309 "Photo.c" +#line 21766 "Photo.c" } #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp21_) { #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = TRUE; -#line 21315 "Photo.c" +#line 21772 "Photo.c" } else { gboolean _tmp28_ = FALSE; MetadataDateTime* _tmp29_; @@ -21321,11 +21778,10 @@ gboolean photo_has_alterations (Photo* self) { _tmp29_ = date_time; #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp29_ != NULL) { -#line 21323 "Photo.c" +#line 21780 "Photo.c" PhotoRow* _tmp30_; time_t _tmp31_; MetadataDateTime* _tmp32_; - time_t _tmp33_; #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp30_ = self->row; #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21333,71 +21789,69 @@ gboolean photo_has_alterations (Photo* self) { #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp32_ = date_time; #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = metadata_date_time_get_timestamp (_tmp32_); -#line 2779 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp31_ != _tmp33_; -#line 21338 "Photo.c" + _tmp28_ = _tmp31_ != metadata_date_time_get_timestamp (_tmp32_); +#line 21792 "Photo.c" } else { #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp28_ = FALSE; -#line 21342 "Photo.c" +#line 21796 "Photo.c" } #line 2779 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = _tmp28_; -#line 21346 "Photo.c" +#line 21800 "Photo.c" } #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp20_) { #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp19_ = TRUE; -#line 21352 "Photo.c" +#line 21806 "Photo.c" } else { + gchar* _tmp33_; gchar* _tmp34_; - gchar* _tmp35_; - const gchar* _tmp36_; + const gchar* _tmp35_; #line 2780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp33_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 2780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_; + _tmp34_ = _tmp33_; #line 2780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = comment; + _tmp35_ = comment; #line 2780 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = g_strcmp0 (_tmp35_, _tmp36_) != 0; + _tmp19_ = g_strcmp0 (_tmp34_, _tmp35_) != 0; #line 2780 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp35_); -#line 21367 "Photo.c" + _g_free0 (_tmp34_); +#line 21821 "Photo.c" } #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_) { #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _tmp18_ = TRUE; -#line 21373 "Photo.c" +#line 21827 "Photo.c" } else { + gchar* _tmp36_; gchar* _tmp37_; - gchar* _tmp38_; - const gchar* _tmp39_; + const gchar* _tmp38_; #line 2781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp36_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 2781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp37_; + _tmp37_ = _tmp36_; #line 2781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = title; + _tmp38_ = title; #line 2781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = g_strcmp0 (_tmp38_, _tmp39_) != 0; + _tmp18_ = g_strcmp0 (_tmp37_, _tmp38_) != 0; #line 2781 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp38_); -#line 21388 "Photo.c" + _g_free0 (_tmp37_); +#line 21842 "Photo.c" } #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp18_; -#line 21392 "Photo.c" +#line 21846 "Photo.c" { - PhotoRow* _tmp40_; + PhotoRow* _tmp39_; #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = self->row; + _tmp39_ = self->row; #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21399 "Photo.c" +#line 21853 "Photo.c" } #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21409,16 +21863,16 @@ gboolean photo_has_alterations (Photo* self) { _metadata_date_time_unref0 (date_time); #line 2777 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21411 "Photo.c" +#line 21865 "Photo.c" } __finally380: { - PhotoRow* _tmp41_; + PhotoRow* _tmp40_; #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = self->row; + _tmp40_ = self->row; #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21420 "Photo.c" +#line 21874 "Photo.c" } #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21433,8 +21887,8 @@ gboolean photo_has_alterations (Photo* self) { #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2776 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp42_; -#line 21436 "Photo.c" + return _tmp41_; +#line 21890 "Photo.c" } #line 2752 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); @@ -21444,23 +21898,25 @@ gboolean photo_has_alterations (Photo* self) { _g_free0 (title); #line 2752 "/home/jens/Source/shotwell/src/Photo.vala" _metadata_date_time_unref0 (date_time); -#line 21446 "Photo.c" +#line 21900 "Photo.c" } -PhotoTransformationState* photo_save_transformation_state (Photo* self) { +PhotoTransformationState* +photo_save_transformation_state (Photo* self) +{ PhotoTransformationState* result = NULL; GError * _inner_error_ = NULL; #line 2786 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 21455 "Photo.c" +#line 21911 "Photo.c" { PhotoRow* _tmp0_; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21462 "Photo.c" +#line 21918 "Photo.c" { PixelTransformer* _tmp1_ = NULL; PixelTransformer* _tmp2_; @@ -21475,7 +21931,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _tmp2_ = self->priv->transformer; #line 2790 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 21477 "Photo.c" +#line 21933 "Photo.c" PixelTransformer* _tmp3_; PixelTransformer* _tmp4_; #line 2790 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21486,19 +21942,19 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _pixel_transformer_unref0 (_tmp1_); #line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp4_; -#line 21488 "Photo.c" +#line 21944 "Photo.c" } else { #line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp1_); #line 2790 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = NULL; -#line 21494 "Photo.c" +#line 21950 "Photo.c" } #line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = self->priv->adjustments; #line 2791 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ != NULL) { -#line 21500 "Photo.c" +#line 21956 "Photo.c" PixelTransformationBundle* _tmp7_; PixelTransformationBundle* _tmp8_; #line 2791 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21509,13 +21965,13 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _pixel_transformation_bundle_unref0 (_tmp5_); #line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp8_; -#line 21511 "Photo.c" +#line 21967 "Photo.c" } else { #line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (_tmp5_); #line 2791 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = NULL; -#line 21517 "Photo.c" +#line 21973 "Photo.c" } #line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = self->row; @@ -21533,18 +21989,18 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _pixel_transformation_bundle_unref0 (_tmp5_); #line 2788 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (_tmp1_); -#line 21535 "Photo.c" +#line 21991 "Photo.c" { PhotoRow* _tmp14_; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" _tmp14_ = self->row; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21542 "Photo.c" +#line 21998 "Photo.c" } #line 2788 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21546 "Photo.c" +#line 22002 "Photo.c" } __finally381: { @@ -21553,7 +22009,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { _tmp15_ = self->row; #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21555 "Photo.c" +#line 22011 "Photo.c" } #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); @@ -21561,189 +22017,187 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) { g_clear_error (&_inner_error_); #line 2787 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 21563 "Photo.c" +#line 22019 "Photo.c" } } -static gpointer _pixel_transformer_ref0 (gpointer self) { +static gpointer +_pixel_transformer_ref0 (gpointer self) +{ #line 2812 "/home/jens/Source/shotwell/src/Photo.vala" return self ? pixel_transformer_ref (self) : NULL; -#line 21571 "Photo.c" +#line 22029 "Photo.c" } -static gpointer _pixel_transformation_bundle_ref0 (gpointer self) { +static gpointer +_pixel_transformation_bundle_ref0 (gpointer self) +{ #line 2813 "/home/jens/Source/shotwell/src/Photo.vala" return self ? pixel_transformation_bundle_ref (self) : NULL; -#line 21578 "Photo.c" +#line 22038 "Photo.c" } -gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* state) { +gboolean +photo_load_transformation_state (Photo* self, + PhotoTransformationState* state) +{ gboolean result = FALSE; PhotoPhotoTransformationStateImpl* state_impl = NULL; - PhotoTransformationState* _tmp0_; + PhotoPhotoTransformationStateImpl* _tmp0_; PhotoPhotoTransformationStateImpl* _tmp1_; - PhotoPhotoTransformationStateImpl* _tmp2_; Orientation saved_orientation = 0; - PhotoPhotoTransformationStateImpl* _tmp3_; - Orientation _tmp4_; + PhotoPhotoTransformationStateImpl* _tmp2_; GeeHashMap* saved_transformations = NULL; - PhotoPhotoTransformationStateImpl* _tmp5_; - GeeHashMap* _tmp6_; + PhotoPhotoTransformationStateImpl* _tmp3_; + GeeHashMap* _tmp4_; PixelTransformer* saved_transformer = NULL; - PhotoPhotoTransformationStateImpl* _tmp7_; - PixelTransformer* _tmp8_; + PhotoPhotoTransformationStateImpl* _tmp5_; + PixelTransformer* _tmp6_; PixelTransformationBundle* saved_adjustments = NULL; - PhotoPhotoTransformationStateImpl* _tmp9_; - PixelTransformationBundle* _tmp10_; + PhotoPhotoTransformationStateImpl* _tmp7_; + PixelTransformationBundle* _tmp8_; gboolean committed = FALSE; - gboolean _tmp31_; + gboolean _tmp28_; GError * _inner_error_ = NULL; #line 2795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_TRANSFORMATION_STATE (state), FALSE); #line 2796 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = state; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (state, PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL) ? ((PhotoPhotoTransformationStateImpl*) state) : NULL); #line 2796 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL) ? ((PhotoPhotoTransformationStateImpl*) _tmp0_) : NULL); -#line 2796 "/home/jens/Source/shotwell/src/Photo.vala" - state_impl = _tmp1_; + state_impl = _tmp0_; #line 2797 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = state_impl; + _tmp1_ = state_impl; #line 2797 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 2798 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2798 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (state_impl); #line 2798 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21623 "Photo.c" +#line 22082 "Photo.c" } #line 2800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = state_impl; -#line 2800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_photo_transformation_state_impl_get_orientation (_tmp3_); + _tmp2_ = state_impl; #line 2800 "/home/jens/Source/shotwell/src/Photo.vala" - saved_orientation = _tmp4_; + saved_orientation = photo_photo_transformation_state_impl_get_orientation (_tmp2_); #line 2801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = state_impl; + _tmp3_ = state_impl; #line 2801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_photo_transformation_state_impl_get_transformations (_tmp5_); + _tmp4_ = photo_photo_transformation_state_impl_get_transformations (_tmp3_); #line 2801 "/home/jens/Source/shotwell/src/Photo.vala" - saved_transformations = _tmp6_; + saved_transformations = _tmp4_; #line 2802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = state_impl; + _tmp5_ = state_impl; #line 2802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_photo_transformation_state_impl_get_transformer (_tmp7_); + _tmp6_ = photo_photo_transformation_state_impl_get_transformer (_tmp5_); #line 2802 "/home/jens/Source/shotwell/src/Photo.vala" - saved_transformer = _tmp8_; + saved_transformer = _tmp6_; #line 2803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = state_impl; + _tmp7_ = state_impl; #line 2803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_photo_transformation_state_impl_get_color_adjustments (_tmp9_); + _tmp8_ = photo_photo_transformation_state_impl_get_color_adjustments (_tmp7_); #line 2803 "/home/jens/Source/shotwell/src/Photo.vala" - saved_adjustments = _tmp10_; -#line 21649 "Photo.c" + saved_adjustments = _tmp8_; +#line 22106 "Photo.c" { - PhotoRow* _tmp11_; + PhotoRow* _tmp9_; #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + _tmp9_ = self->row; #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21656 "Photo.c" +#line 22113 "Photo.c" { - PhotoTable* _tmp12_; - PhotoTable* _tmp13_; - PhotoRow* _tmp14_; - PhotoID _tmp15_; - Orientation _tmp16_; - GeeHashMap* _tmp17_; - gboolean _tmp18_; - gboolean _tmp19_; -#line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_get_instance (); + PhotoTable* _tmp10_; + PhotoTable* _tmp11_; + PhotoRow* _tmp12_; + PhotoID _tmp13_; + Orientation _tmp14_; + GeeHashMap* _tmp15_; + gboolean _tmp16_; #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; + _tmp10_ = photo_table_get_instance (); #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp11_ = _tmp10_; #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->photo_id; + _tmp12_ = self->row; #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = saved_orientation; + _tmp13_ = _tmp12_->photo_id; #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = saved_transformations; + _tmp14_ = saved_orientation; #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = photo_table_set_transformation_state (_tmp13_, &_tmp15_, _tmp16_, _tmp17_); + _tmp15_ = saved_transformations; #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp18_; + committed = photo_table_set_transformation_state (_tmp11_, &_tmp13_, _tmp14_, _tmp15_); #line 2807 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp13_); + _database_table_unref0 (_tmp11_); #line 2809 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = committed; + _tmp16_ = committed; #line 2809 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp19_) { -#line 21688 "Photo.c" - PhotoRow* _tmp20_; - Orientation _tmp21_; - PhotoRow* _tmp22_; - GeeHashMap* _tmp23_; - GeeHashMap* _tmp24_; - PixelTransformer* _tmp25_; - PixelTransformer* _tmp26_; - PixelTransformationBundle* _tmp27_; - PixelTransformationBundle* _tmp28_; + if (_tmp16_) { +#line 22142 "Photo.c" + PhotoRow* _tmp17_; + Orientation _tmp18_; + PhotoRow* _tmp19_; + GeeHashMap* _tmp20_; + GeeHashMap* _tmp21_; + PixelTransformer* _tmp22_; + PixelTransformer* _tmp23_; + PixelTransformationBundle* _tmp24_; + PixelTransformationBundle* _tmp25_; #line 2810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->row; + _tmp17_ = self->row; #line 2810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = saved_orientation; + _tmp18_ = saved_orientation; #line 2810 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_->orientation = _tmp21_; + _tmp17_->orientation = _tmp18_; #line 2811 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = self->row; + _tmp19_ = self->row; #line 2811 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = saved_transformations; + _tmp20_ = saved_transformations; #line 2811 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _g_object_ref0 (_tmp23_); + _tmp21_ = _g_object_ref0 (_tmp20_); #line 2811 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp22_->transformations); + _g_object_unref0 (_tmp19_->transformations); #line 2811 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_->transformations = _tmp24_; + _tmp19_->transformations = _tmp21_; #line 2812 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = saved_transformer; + _tmp22_ = saved_transformer; #line 2812 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _pixel_transformer_ref0 (_tmp25_); + _tmp23_ = _pixel_transformer_ref0 (_tmp22_); #line 2812 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); #line 2812 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->transformer = _tmp26_; + self->priv->transformer = _tmp23_; #line 2813 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = saved_adjustments; + _tmp24_ = saved_adjustments; #line 2813 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _pixel_transformation_bundle_ref0 (_tmp27_); + _tmp25_ = _pixel_transformation_bundle_ref0 (_tmp24_); #line 2813 "/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 = _tmp28_; -#line 21730 "Photo.c" + self->priv->adjustments = _tmp25_; +#line 22184 "Photo.c" } } __finally382: { - PhotoRow* _tmp29_; + PhotoRow* _tmp26_; #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = self->row; + _tmp26_ = self->row; #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21740 "Photo.c" +#line 22194 "Photo.c" } #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 21744 "Photo.c" - gboolean _tmp30_ = FALSE; +#line 22198 "Photo.c" + gboolean _tmp27_ = FALSE; #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (saved_adjustments); #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21757,26 +22211,26 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2806 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp30_; -#line 21760 "Photo.c" + return _tmp27_; +#line 22214 "Photo.c" } } #line 2817 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = committed; + _tmp28_ = committed; #line 2817 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp31_) { -#line 21767 "Photo.c" - Alteration* _tmp32_; - Alteration* _tmp33_; + if (_tmp28_) { +#line 22221 "Photo.c" + Alteration* _tmp29_; + Alteration* _tmp30_; #line 2818 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = alteration_new ("image", "transformation-state"); + _tmp29_ = alteration_new ("image", "transformation-state"); #line 2818 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_; + _tmp30_ = _tmp29_; #line 2818 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp33_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp30_); #line 2818 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp33_); -#line 21778 "Photo.c" + _alteration_unref0 (_tmp30_); +#line 22232 "Photo.c" } #line 2820 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; @@ -21790,47 +22244,51 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* _g_object_unref0 (state_impl); #line 2820 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21792 "Photo.c" +#line 22246 "Photo.c" } -void photo_remove_all_transformations (Photo* self) { +void +photo_remove_all_transformations (Photo* self) +{ #line 2823 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2824 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, TRUE); -#line 21801 "Photo.c" +#line 22257 "Photo.c" } -static void photo_internal_remove_all_transformations (Photo* self, gboolean notify) { +static void +photo_internal_remove_all_transformations (Photo* self, + gboolean notify) +{ gboolean is_altered = FALSE; - gboolean _tmp21_ = FALSE; - gboolean _tmp22_; + gboolean _tmp20_ = FALSE; + gboolean _tmp21_; GError * _inner_error_ = NULL; #line 2827 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2828 "/home/jens/Source/shotwell/src/Photo.vala" is_altered = FALSE; -#line 21814 "Photo.c" +#line 22273 "Photo.c" { PhotoRow* _tmp0_; #line 2829 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2829 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21821 "Photo.c" +#line 22280 "Photo.c" { PhotoTable* _tmp1_; PhotoTable* _tmp2_; PhotoRow* _tmp3_; PhotoID _tmp4_; - gboolean _tmp5_; + PhotoRow* _tmp5_; PhotoRow* _tmp6_; - PhotoRow* _tmp7_; - Orientation _tmp8_; - BackingPhotoRow* _tmp9_; - Orientation _tmp10_; + Orientation _tmp7_; + BackingPhotoRow* _tmp8_; + Orientation _tmp9_; #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_table_get_instance (); #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21840,17 +22298,15 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->photo_id; #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_table_remove_all_transformations (_tmp2_, &_tmp4_); -#line 2830 "/home/jens/Source/shotwell/src/Photo.vala" - is_altered = _tmp5_; + is_altered = photo_table_remove_all_transformations (_tmp2_, &_tmp4_); #line 2830 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp2_); #line 2831 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 2831 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp6_->transformations); + _g_object_unref0 (_tmp5_->transformations); #line 2831 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_->transformations = NULL; + _tmp5_->transformations = NULL; #line 2833 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); #line 2833 "/home/jens/Source/shotwell/src/Photo.vala" @@ -21860,62 +22316,62 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not #line 2834 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->adjustments = NULL; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + _tmp6_ = self->row; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->orientation; + _tmp7_ = _tmp6_->orientation; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = self->backing_photo_row; + _tmp8_ = self->backing_photo_row; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_->original_orientation; + _tmp9_ = _tmp8_->original_orientation; #line 2836 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_ != _tmp10_) { -#line 21871 "Photo.c" + if (_tmp7_ != _tmp9_) { +#line 22327 "Photo.c" + PhotoTable* _tmp10_; PhotoTable* _tmp11_; - PhotoTable* _tmp12_; - PhotoRow* _tmp13_; - PhotoID _tmp14_; - BackingPhotoRow* _tmp15_; - Orientation _tmp16_; - PhotoRow* _tmp17_; - BackingPhotoRow* _tmp18_; - Orientation _tmp19_; + PhotoRow* _tmp12_; + PhotoID _tmp13_; + BackingPhotoRow* _tmp14_; + Orientation _tmp15_; + PhotoRow* _tmp16_; + BackingPhotoRow* _tmp17_; + Orientation _tmp18_; #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_table_get_instance (); + _tmp10_ = photo_table_get_instance (); #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->row; + _tmp12_ = self->row; #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->photo_id; + _tmp13_ = _tmp12_->photo_id; #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = self->backing_photo_row; + _tmp14_ = self->backing_photo_row; #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_->original_orientation; + _tmp15_ = _tmp14_->original_orientation; #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_set_orientation (_tmp12_, &_tmp14_, _tmp16_); + photo_table_set_orientation (_tmp11_, &_tmp13_, _tmp15_); #line 2837 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp12_); + _database_table_unref0 (_tmp11_); #line 2839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = self->row; + _tmp16_ = self->row; #line 2839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->backing_photo_row; + _tmp17_ = self->backing_photo_row; #line 2839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->original_orientation; + _tmp18_ = _tmp17_->original_orientation; #line 2839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_->orientation = _tmp19_; + _tmp16_->orientation = _tmp18_; #line 2840 "/home/jens/Source/shotwell/src/Photo.vala" is_altered = TRUE; -#line 21907 "Photo.c" +#line 22363 "Photo.c" } } __finally383: { - PhotoRow* _tmp20_; + PhotoRow* _tmp19_; #line 2829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->row; + _tmp19_ = self->row; #line 2829 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21917 "Photo.c" +#line 22373 "Photo.c" } #line 2829 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -21925,56 +22381,54 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not g_clear_error (&_inner_error_); #line 2829 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 21927 "Photo.c" +#line 22383 "Photo.c" } } #line 2844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = is_altered; -#line 2844 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_) { -#line 21934 "Photo.c" - gboolean _tmp23_; + _tmp21_ = is_altered; #line 2844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = notify; + if (_tmp21_) { #line 2844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp23_; -#line 21940 "Photo.c" + _tmp20_ = notify; +#line 22392 "Photo.c" } else { #line 2844 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = FALSE; -#line 21944 "Photo.c" + _tmp20_ = FALSE; +#line 22396 "Photo.c" } #line 2844 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_) { -#line 21948 "Photo.c" - Alteration* _tmp24_; - Alteration* _tmp25_; + if (_tmp20_) { +#line 22400 "Photo.c" + Alteration* _tmp22_; + Alteration* _tmp23_; #line 2845 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = alteration_new ("image", "revert"); + _tmp22_ = alteration_new ("image", "revert"); #line 2845 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 2845 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_); #line 2845 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp25_); -#line 21959 "Photo.c" + _alteration_unref0 (_tmp23_); +#line 22411 "Photo.c" } } -Orientation photo_get_original_orientation (Photo* self) { +Orientation +photo_get_original_orientation (Photo* self) +{ Orientation result = 0; GError * _inner_error_ = NULL; #line 2848 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 21969 "Photo.c" +#line 22423 "Photo.c" { PhotoRow* _tmp0_; #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 21976 "Photo.c" +#line 22430 "Photo.c" { BackingPhotoRow* _tmp1_; Orientation _tmp2_; @@ -21984,18 +22438,18 @@ Orientation photo_get_original_orientation (Photo* self) { _tmp2_ = _tmp1_->original_orientation; #line 2850 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 21986 "Photo.c" +#line 22440 "Photo.c" { PhotoRow* _tmp3_; #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 21993 "Photo.c" +#line 22447 "Photo.c" } #line 2850 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 21997 "Photo.c" +#line 22451 "Photo.c" } __finally384: { @@ -22004,7 +22458,7 @@ Orientation photo_get_original_orientation (Photo* self) { _tmp4_ = self->row; #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22006 "Photo.c" +#line 22460 "Photo.c" } #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -22012,24 +22466,26 @@ Orientation photo_get_original_orientation (Photo* self) { g_clear_error (&_inner_error_); #line 2849 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 22014 "Photo.c" +#line 22468 "Photo.c" } } -Orientation photo_get_orientation (Photo* self) { +Orientation +photo_get_orientation (Photo* self) +{ Orientation result = 0; GError * _inner_error_ = NULL; #line 2854 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), 0); -#line 22024 "Photo.c" +#line 22480 "Photo.c" { PhotoRow* _tmp0_; #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22031 "Photo.c" +#line 22487 "Photo.c" { PhotoRow* _tmp1_; Orientation _tmp2_; @@ -22039,18 +22495,18 @@ Orientation photo_get_orientation (Photo* self) { _tmp2_ = _tmp1_->orientation; #line 2856 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp2_; -#line 22041 "Photo.c" +#line 22497 "Photo.c" { PhotoRow* _tmp3_; #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22048 "Photo.c" +#line 22504 "Photo.c" } #line 2856 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22052 "Photo.c" +#line 22508 "Photo.c" } __finally385: { @@ -22059,7 +22515,7 @@ Orientation photo_get_orientation (Photo* self) { _tmp4_ = self->row; #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22061 "Photo.c" +#line 22517 "Photo.c" } #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -22067,129 +22523,122 @@ Orientation photo_get_orientation (Photo* self) { g_clear_error (&_inner_error_); #line 2855 "/home/jens/Source/shotwell/src/Photo.vala" return 0; -#line 22069 "Photo.c" +#line 22525 "Photo.c" } } -gboolean photo_set_orientation (Photo* self, Orientation orientation) { +gboolean +photo_set_orientation (Photo* self, + Orientation orientation) +{ gboolean result = FALSE; gboolean committed = FALSE; - gboolean _tmp15_; + gboolean _tmp11_; GError * _inner_error_ = NULL; #line 2860 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2861 "/home/jens/Source/shotwell/src/Photo.vala" committed = FALSE; -#line 22083 "Photo.c" +#line 22542 "Photo.c" { PhotoRow* _tmp0_; #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22090 "Photo.c" +#line 22549 "Photo.c" { PhotoRow* _tmp1_; Orientation _tmp2_; - Orientation _tmp3_; #line 2863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2863 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->orientation; #line 2863 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = orientation; -#line 2863 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ != _tmp3_) { -#line 22103 "Photo.c" + if (_tmp2_ != orientation) { +#line 22559 "Photo.c" + PhotoTable* _tmp3_; PhotoTable* _tmp4_; - PhotoTable* _tmp5_; - PhotoRow* _tmp6_; - PhotoID _tmp7_; - Orientation _tmp8_; - gboolean _tmp9_; - gboolean _tmp10_; -#line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_table_get_instance (); -#line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + PhotoRow* _tmp5_; + PhotoID _tmp6_; + gboolean _tmp7_; #line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp3_ = photo_table_get_instance (); #line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_->photo_id; + _tmp4_ = _tmp3_; #line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = orientation; + _tmp5_ = self->row; #line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_table_set_orientation (_tmp5_, &_tmp7_, _tmp8_); + _tmp6_ = _tmp5_->photo_id; #line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - committed = _tmp9_; + committed = photo_table_set_orientation (_tmp4_, &_tmp6_, orientation); #line 2864 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp5_); + _database_table_unref0 (_tmp4_); #line 2865 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = committed; + _tmp7_ = committed; #line 2865 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_) { -#line 22131 "Photo.c" - PhotoRow* _tmp11_; - Orientation _tmp12_; -#line 2866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + if (_tmp7_) { +#line 22581 "Photo.c" + PhotoRow* _tmp8_; #line 2866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = orientation; + _tmp8_ = self->row; #line 2866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_->orientation = _tmp12_; -#line 22140 "Photo.c" + _tmp8_->orientation = orientation; +#line 22587 "Photo.c" } } } __finally386: { - PhotoRow* _tmp13_; + PhotoRow* _tmp9_; #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->row; + _tmp9_ = self->row; #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22151 "Photo.c" +#line 22598 "Photo.c" } #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 22155 "Photo.c" - gboolean _tmp14_ = FALSE; +#line 22602 "Photo.c" + gboolean _tmp10_ = FALSE; #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 2862 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2862 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp14_; -#line 22163 "Photo.c" + return _tmp10_; +#line 22610 "Photo.c" } } #line 2870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = committed; + _tmp11_ = committed; #line 2870 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_) { -#line 22170 "Photo.c" - Alteration* _tmp16_; - Alteration* _tmp17_; + if (_tmp11_) { +#line 22617 "Photo.c" + Alteration* _tmp12_; + Alteration* _tmp13_; #line 2871 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = alteration_new ("image", "orientation"); + _tmp12_ = alteration_new ("image", "orientation"); #line 2871 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp13_ = _tmp12_; #line 2871 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp17_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_); #line 2871 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp17_); -#line 22181 "Photo.c" + _alteration_unref0 (_tmp13_); +#line 22628 "Photo.c" } #line 2873 "/home/jens/Source/shotwell/src/Photo.vala" result = committed; #line 2873 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22187 "Photo.c" +#line 22634 "Photo.c" } -gboolean photo_check_can_rotate (Photo* self) { +gboolean +photo_check_can_rotate (Photo* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 2876 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22200,11 +22649,14 @@ gboolean photo_check_can_rotate (Photo* self) { result = _tmp0_; #line 2877 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22202 "Photo.c" +#line 22651 "Photo.c" } -static void photo_real_rotate (Photo* self, Rotation rotation) { +static void +photo_real_rotate (Photo* self, + Rotation rotation) +{ GError * _inner_error_ = NULL; { PhotoRow* _tmp0_; @@ -22212,29 +22664,20 @@ static void photo_real_rotate (Photo* self, Rotation rotation) { _tmp0_ = self->row; #line 2881 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22214 "Photo.c" +#line 22666 "Photo.c" { - Orientation _tmp1_; - Rotation _tmp2_; - Orientation _tmp3_; -#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_orientation (self); -#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = rotation; #line 2882 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = orientation_perform (_tmp1_, _tmp2_); -#line 2882 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_orientation (self, _tmp3_); -#line 22227 "Photo.c" + photo_set_orientation (self, orientation_perform (photo_get_orientation (self), rotation)); +#line 22670 "Photo.c" } __finally387: { - PhotoRow* _tmp4_; + PhotoRow* _tmp1_; #line 2881 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->row; + _tmp1_ = self->row; #line 2881 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22236 "Photo.c" +#line 22679 "Photo.c" } #line 2881 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -22244,37 +22687,43 @@ static void photo_real_rotate (Photo* self, Rotation rotation) { g_clear_error (&_inner_error_); #line 2881 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 22246 "Photo.c" +#line 22689 "Photo.c" } } } -void photo_rotate (Photo* self, Rotation rotation) { +void +photo_rotate (Photo* self, + Rotation rotation) +{ #line 2880 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2880 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->rotate (self, rotation); -#line 22257 "Photo.c" +#line 22703 "Photo.c" } -static gboolean photo_has_transformation (Photo* self, const gchar* name) { +static gboolean +photo_has_transformation (Photo* self, + const gchar* name) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 2886 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2886 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (name != NULL, FALSE); -#line 22268 "Photo.c" +#line 22717 "Photo.c" { PhotoRow* _tmp0_; - gboolean _tmp10_ = FALSE; + gboolean _tmp8_ = FALSE; #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22276 "Photo.c" +#line 22725 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoRow* _tmp2_; @@ -22285,63 +22734,60 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) { _tmp3_ = _tmp2_->transformations; #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 22287 "Photo.c" +#line 22736 "Photo.c" PhotoRow* _tmp4_; GeeHashMap* _tmp5_; - const gchar* _tmp6_; - gboolean _tmp7_; #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->row; #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->transformations; #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = name; -#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_); -#line 2888 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp7_; -#line 22302 "Photo.c" + _tmp1_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name); +#line 22745 "Photo.c" } else { #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 22306 "Photo.c" +#line 22749 "Photo.c" } #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp1_; -#line 22310 "Photo.c" +#line 22753 "Photo.c" { - PhotoRow* _tmp8_; + PhotoRow* _tmp6_; #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->row; + _tmp6_ = self->row; #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22317 "Photo.c" +#line 22760 "Photo.c" } #line 2888 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22321 "Photo.c" +#line 22764 "Photo.c" } __finally388: { - PhotoRow* _tmp9_; + PhotoRow* _tmp7_; #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = self->row; + _tmp7_ = self->row; #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22330 "Photo.c" +#line 22773 "Photo.c" } #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2887 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp10_; -#line 22338 "Photo.c" + return _tmp8_; +#line 22781 "Photo.c" } } -static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { +static KeyValueMap* +photo_get_transformation (Photo* self, + const gchar* name) +{ KeyValueMap* result = NULL; KeyValueMap* map = NULL; GError * _inner_error_ = NULL; @@ -22351,14 +22797,14 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { g_return_val_if_fail (name != NULL, NULL); #line 2896 "/home/jens/Source/shotwell/src/Photo.vala" map = NULL; -#line 22353 "Photo.c" +#line 22799 "Photo.c" { PhotoRow* _tmp0_; #line 2897 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2897 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22360 "Photo.c" +#line 22806 "Photo.c" { PhotoRow* _tmp1_; GeeHashMap* _tmp2_; @@ -22368,51 +22814,48 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { _tmp2_ = _tmp1_->transformations; #line 2898 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 22370 "Photo.c" +#line 22816 "Photo.c" PhotoRow* _tmp3_; GeeHashMap* _tmp4_; - const gchar* _tmp5_; - gpointer _tmp6_; - KeyValueMap* _tmp7_; + gpointer _tmp5_; + KeyValueMap* _tmp6_; #line 2899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2899 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->transformations; #line 2899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = name; -#line 2899 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); + _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name); #line 2899 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); #line 2899 "/home/jens/Source/shotwell/src/Photo.vala" - map = (KeyValueMap*) _tmp6_; + map = (KeyValueMap*) _tmp5_; #line 2900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = map; + _tmp6_ = map; #line 2900 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_ != NULL) { -#line 22392 "Photo.c" + if (_tmp6_ != NULL) { +#line 22835 "Photo.c" + KeyValueMap* _tmp7_; KeyValueMap* _tmp8_; - KeyValueMap* _tmp9_; #line 2901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = map; + _tmp7_ = map; #line 2901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = key_value_map_copy (_tmp8_); + _tmp8_ = key_value_map_copy (_tmp7_); #line 2901 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); #line 2901 "/home/jens/Source/shotwell/src/Photo.vala" - map = _tmp9_; -#line 22403 "Photo.c" + map = _tmp8_; +#line 22846 "Photo.c" } } } __finally389: { - PhotoRow* _tmp10_; + PhotoRow* _tmp9_; #line 2897 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->row; + _tmp9_ = self->row; #line 2897 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22414 "Photo.c" +#line 22857 "Photo.c" } #line 2897 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -22424,56 +22867,55 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) { g_clear_error (&_inner_error_); #line 2897 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 22426 "Photo.c" +#line 22869 "Photo.c" } } #line 2905 "/home/jens/Source/shotwell/src/Photo.vala" result = map; #line 2905 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22433 "Photo.c" +#line 22876 "Photo.c" } -static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) { +static gboolean +photo_set_transformation (Photo* self, + KeyValueMap* trans) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 2908 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2908 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_KEY_VALUE_MAP (trans), FALSE); -#line 22444 "Photo.c" +#line 22890 "Photo.c" { PhotoRow* _tmp0_; - gboolean _tmp20_ = FALSE; + gboolean _tmp16_ = FALSE; #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22452 "Photo.c" +#line 22898 "Photo.c" { PhotoRow* _tmp1_; GeeHashMap* _tmp2_; PhotoRow* _tmp5_; GeeHashMap* _tmp6_; - KeyValueMap* _tmp7_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; - KeyValueMap* _tmp10_; - PhotoTable* _tmp11_; - PhotoTable* _tmp12_; - PhotoRow* _tmp13_; - PhotoID _tmp14_; - KeyValueMap* _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; + PhotoTable* _tmp9_; + PhotoTable* _tmp10_; + PhotoRow* _tmp11_; + PhotoID _tmp12_; + gboolean _tmp13_; #line 2910 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2910 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->transformations; #line 2910 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ == NULL) { -#line 22475 "Photo.c" +#line 22917 "Photo.c" PhotoRow* _tmp3_; GeeHashMap* _tmp4_; #line 2911 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22484,229 +22926,217 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) { _g_object_unref0 (_tmp3_->transformations); #line 2911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_->transformations = _tmp4_; -#line 22486 "Photo.c" +#line 22928 "Photo.c" } #line 2913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = self->row; #line 2913 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = _tmp5_->transformations; #line 2913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = trans; -#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = key_value_map_get_group (_tmp7_); -#line 2913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp7_ = key_value_map_get_group (trans); #line 2913 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = trans; + _tmp8_ = _tmp7_; #line 2913 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_, trans); #line 2913 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp9_); -#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_table_get_instance (); -#line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_; + _g_free0 (_tmp8_); #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->row; + _tmp9_ = photo_table_get_instance (); #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->photo_id; + _tmp10_ = _tmp9_; #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = trans; + _tmp11_ = self->row; #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo_table_set_transformation (_tmp12_, &_tmp14_, _tmp15_); + _tmp12_ = _tmp11_->photo_id; #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp13_ = photo_table_set_transformation (_tmp10_, &_tmp12_, trans); #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp12_); + _database_table_unref0 (_tmp10_); #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp17_; -#line 22522 "Photo.c" + result = _tmp13_; +#line 22956 "Photo.c" { - PhotoRow* _tmp18_; + PhotoRow* _tmp14_; #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->row; + _tmp14_ = self->row; #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22529 "Photo.c" +#line 22963 "Photo.c" } #line 2915 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22533 "Photo.c" +#line 22967 "Photo.c" } __finally390: { - PhotoRow* _tmp19_; + PhotoRow* _tmp15_; #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp15_ = self->row; #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22542 "Photo.c" +#line 22976 "Photo.c" } #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2909 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp20_; -#line 22550 "Photo.c" + return _tmp16_; +#line 22984 "Photo.c" } } -static gboolean photo_remove_transformation (Photo* self, const gchar* name) { +static gboolean +photo_remove_transformation (Photo* self, + const gchar* name) +{ gboolean result = FALSE; gboolean altered_cache = FALSE; gboolean altered_persistent = FALSE; - gboolean _tmp20_ = FALSE; - gboolean _tmp21_; + gboolean _tmp17_ = FALSE; + gboolean _tmp18_; GError * _inner_error_ = NULL; #line 2919 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2919 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (name != NULL, FALSE); -#line 22566 "Photo.c" +#line 23003 "Photo.c" { PhotoRow* _tmp0_; #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 22573 "Photo.c" +#line 23010 "Photo.c" { PhotoRow* _tmp1_; GeeHashMap* _tmp2_; + PhotoTable* _tmp11_; PhotoTable* _tmp12_; - PhotoTable* _tmp13_; - PhotoRow* _tmp14_; - PhotoID _tmp15_; - const gchar* _tmp16_; - gboolean _tmp17_; + PhotoRow* _tmp13_; + PhotoID _tmp14_; #line 2922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->row; #line 2922 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_->transformations; #line 2922 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 22589 "Photo.c" +#line 23024 "Photo.c" PhotoRow* _tmp3_; GeeHashMap* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; - PhotoRow* _tmp7_; - GeeHashMap* _tmp8_; + gboolean _tmp5_; + PhotoRow* _tmp6_; + GeeHashMap* _tmp7_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; #line 2923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = self->row; #line 2923 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = _tmp3_->transformations; #line 2923 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = name; + _tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name, NULL); #line 2923 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, NULL); -#line 2923 "/home/jens/Source/shotwell/src/Photo.vala" - altered_cache = _tmp6_; + altered_cache = _tmp5_; #line 2924 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + _tmp6_ = self->row; #line 2924 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->transformations; + _tmp7_ = _tmp6_->transformations; #line 2924 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp8_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 2924 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 2924 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_ == 0) { -#line 22618 "Photo.c" - PhotoRow* _tmp11_; + if (_tmp9_ == 0) { +#line 23050 "Photo.c" + PhotoRow* _tmp10_; #line 2925 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->row; + _tmp10_ = self->row; #line 2925 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp11_->transformations); + _g_object_unref0 (_tmp10_->transformations); #line 2925 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_->transformations = NULL; -#line 22626 "Photo.c" + _tmp10_->transformations = NULL; +#line 23058 "Photo.c" } } else { #line 2927 "/home/jens/Source/shotwell/src/Photo.vala" altered_cache = FALSE; -#line 22631 "Photo.c" +#line 23063 "Photo.c" } #line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_table_get_instance (); -#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_; -#line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp11_ = photo_table_get_instance (); #line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->photo_id; + _tmp12_ = _tmp11_; #line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = name; + _tmp13_ = self->row; #line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_table_remove_transformation (_tmp13_, &_tmp15_, _tmp16_); + _tmp14_ = _tmp13_->photo_id; #line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - altered_persistent = _tmp17_; + altered_persistent = photo_table_remove_transformation (_tmp12_, &_tmp14_, name); #line 2930 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp13_); -#line 22649 "Photo.c" + _database_table_unref0 (_tmp12_); +#line 23077 "Photo.c" } __finally391: { - PhotoRow* _tmp18_; + PhotoRow* _tmp15_; #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->row; + _tmp15_ = self->row; #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 22658 "Photo.c" +#line 23086 "Photo.c" } #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 22662 "Photo.c" - gboolean _tmp19_ = FALSE; +#line 23090 "Photo.c" + gboolean _tmp16_ = FALSE; #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 2921 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp19_; -#line 22670 "Photo.c" + return _tmp16_; +#line 23098 "Photo.c" } } #line 2934 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = altered_cache; + _tmp18_ = altered_cache; #line 2934 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_) { + if (_tmp18_) { #line 2934 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = TRUE; -#line 22679 "Photo.c" + _tmp17_ = TRUE; +#line 23107 "Photo.c" } else { #line 2934 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = altered_persistent; -#line 22683 "Photo.c" + _tmp17_ = altered_persistent; +#line 23111 "Photo.c" } #line 2934 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp20_; + result = _tmp17_; #line 2934 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22689 "Photo.c" +#line 23117 "Photo.c" } -gboolean photo_has_crop (Photo* self) { +gboolean +photo_has_crop (Photo* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 2937 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2938 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_has_transformation (self, "crop"); -#line 2938 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_has_transformation (self, "crop"); #line 2938 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22704 "Photo.c" +#line 23131 "Photo.c" } -gboolean photo_get_raw_crop (Photo* self, Box* crop) { +gboolean +photo_get_raw_crop (Photo* self, + Box* crop) +{ Box _vala_crop = {0}; gboolean result = FALSE; KeyValueMap* map = NULL; @@ -22714,24 +23144,20 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { KeyValueMap* _tmp1_; gint left = 0; KeyValueMap* _tmp2_; - gint _tmp3_; gint top = 0; - KeyValueMap* _tmp4_; - gint _tmp5_; + KeyValueMap* _tmp3_; gint right = 0; - KeyValueMap* _tmp6_; - gint _tmp7_; + KeyValueMap* _tmp4_; gint bottom = 0; - KeyValueMap* _tmp8_; + KeyValueMap* _tmp5_; + gboolean _tmp6_ = FALSE; + gboolean _tmp7_ = FALSE; + gboolean _tmp8_ = FALSE; gint _tmp9_; - gboolean _tmp10_ = FALSE; - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; gint _tmp13_; - gint _tmp17_; - gint _tmp18_; - gint _tmp19_; - gint _tmp20_; + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; #line 2942 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2943 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22752,79 +23178,71 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { if (crop) { #line 2947 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22754 "Photo.c" +#line 23180 "Photo.c" } #line 2947 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22758 "Photo.c" +#line 23184 "Photo.c" } #line 2949 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map; #line 2949 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = key_value_map_get_int (_tmp2_, "left", -1); -#line 2949 "/home/jens/Source/shotwell/src/Photo.vala" - left = _tmp3_; + left = key_value_map_get_int (_tmp2_, "left", -1); #line 2950 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = map; -#line 2950 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = key_value_map_get_int (_tmp4_, "top", -1); + _tmp3_ = map; #line 2950 "/home/jens/Source/shotwell/src/Photo.vala" - top = _tmp5_; + top = key_value_map_get_int (_tmp3_, "top", -1); #line 2951 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = map; -#line 2951 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = key_value_map_get_int (_tmp6_, "right", -1); + _tmp4_ = map; #line 2951 "/home/jens/Source/shotwell/src/Photo.vala" - right = _tmp7_; -#line 2952 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = map; + right = key_value_map_get_int (_tmp4_, "right", -1); #line 2952 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = key_value_map_get_int (_tmp8_, "bottom", -1); + _tmp5_ = map; #line 2952 "/home/jens/Source/shotwell/src/Photo.vala" - bottom = _tmp9_; + bottom = key_value_map_get_int (_tmp5_, "bottom", -1); #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = left; + _tmp9_ = left; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_ == -1) { + if (_tmp9_ == -1) { #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = TRUE; -#line 22790 "Photo.c" + _tmp8_ = TRUE; +#line 23208 "Photo.c" } else { - gint _tmp14_; + gint _tmp10_; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = top; + _tmp10_ = top; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp14_ == -1; -#line 22797 "Photo.c" + _tmp8_ = _tmp10_ == -1; +#line 23215 "Photo.c" } #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { + if (_tmp8_) { #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = TRUE; -#line 22803 "Photo.c" + _tmp7_ = TRUE; +#line 23221 "Photo.c" } else { - gint _tmp15_; + gint _tmp11_; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = right; + _tmp11_ = right; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp15_ == -1; -#line 22810 "Photo.c" + _tmp7_ = _tmp11_ == -1; +#line 23228 "Photo.c" } #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { + if (_tmp7_) { #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = TRUE; -#line 22816 "Photo.c" + _tmp6_ = TRUE; +#line 23234 "Photo.c" } else { - gint _tmp16_; + gint _tmp12_; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = bottom; + _tmp12_ = bottom; #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp16_ == -1; -#line 22823 "Photo.c" + _tmp6_ = _tmp12_ == -1; +#line 23241 "Photo.c" } #line 2954 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_) { + if (_tmp6_) { #line 2955 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 2955 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22833,22 +23251,22 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { if (crop) { #line 2955 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22835 "Photo.c" +#line 23253 "Photo.c" } #line 2955 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22839 "Photo.c" +#line 23257 "Photo.c" } #line 2957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = left; + _tmp13_ = left; #line 2957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = top; + _tmp14_ = top; #line 2957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = right; + _tmp15_ = right; #line 2957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = bottom; + _tmp16_ = bottom; #line 2957 "/home/jens/Source/shotwell/src/Photo.vala" - box_init (&_vala_crop, _tmp17_, _tmp18_, _tmp19_, _tmp20_); + box_init (&_vala_crop, _tmp13_, _tmp14_, _tmp15_, _tmp16_); #line 2959 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 2959 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22857,15 +23275,18 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) { if (crop) { #line 2959 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 22859 "Photo.c" +#line 23277 "Photo.c" } #line 2959 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22863 "Photo.c" +#line 23281 "Photo.c" } -static void photo_set_raw_crop (Photo* self, Box* crop) { +static void +photo_set_raw_crop (Photo* self, + Box* crop) +{ KeyValueMap* map = NULL; KeyValueMap* _tmp0_; KeyValueMap* _tmp1_; @@ -22881,7 +23302,6 @@ static void photo_set_raw_crop (Photo* self, Box* crop) { Box _tmp11_; gint _tmp12_; KeyValueMap* _tmp13_; - gboolean _tmp14_; #line 2963 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2963 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22925,36 +23345,36 @@ static void photo_set_raw_crop (Photo* self, Box* crop) { #line 2970 "/home/jens/Source/shotwell/src/Photo.vala" _tmp13_ = map; #line 2970 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo_set_transformation (self, _tmp13_); -#line 2970 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_) { -#line 22930 "Photo.c" + if (photo_set_transformation (self, _tmp13_)) { +#line 23348 "Photo.c" + Alteration* _tmp14_; Alteration* _tmp15_; - Alteration* _tmp16_; #line 2971 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = alteration_new ("image", "crop"); + _tmp14_ = alteration_new ("image", "crop"); #line 2971 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 2971 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_); #line 2971 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp16_); -#line 22941 "Photo.c" + _alteration_unref0 (_tmp15_); +#line 23359 "Photo.c" } #line 2963 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 22945 "Photo.c" +#line 23363 "Photo.c" } -static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) { +static gboolean +photo_get_raw_straighten (Photo* self, + gdouble* angle) +{ gdouble _vala_angle = 0.0; gboolean result = FALSE; KeyValueMap* map = NULL; KeyValueMap* _tmp0_; KeyValueMap* _tmp1_; KeyValueMap* _tmp2_; - gdouble _tmp3_; #line 2974 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 2975 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22975,18 +23395,16 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) { if (angle) { #line 2979 "/home/jens/Source/shotwell/src/Photo.vala" *angle = _vala_angle; -#line 22977 "Photo.c" +#line 23397 "Photo.c" } #line 2979 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 22981 "Photo.c" +#line 23401 "Photo.c" } #line 2982 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = map; #line 2982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = key_value_map_get_double (_tmp2_, "angle", 0.0); -#line 2982 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_angle = _tmp3_; + _vala_angle = key_value_map_get_double (_tmp2_, "angle", 0.0); #line 2984 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 2984 "/home/jens/Source/shotwell/src/Photo.vala" @@ -22995,21 +23413,22 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) { if (angle) { #line 2984 "/home/jens/Source/shotwell/src/Photo.vala" *angle = _vala_angle; -#line 22997 "Photo.c" +#line 23415 "Photo.c" } #line 2984 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23001 "Photo.c" +#line 23419 "Photo.c" } -static void photo_set_raw_straighten (Photo* self, gdouble theta) { +static void +photo_set_raw_straighten (Photo* self, + gdouble theta) +{ KeyValueMap* map = NULL; KeyValueMap* _tmp0_; KeyValueMap* _tmp1_; - gdouble _tmp2_; - KeyValueMap* _tmp3_; - gboolean _tmp4_; + KeyValueMap* _tmp2_; #line 2987 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 2988 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23019,35 +23438,34 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) { #line 2989 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = map; #line 2989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = theta; -#line 2989 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_set_double (_tmp1_, "angle", _tmp2_); + key_value_map_set_double (_tmp1_, "angle", theta); #line 2991 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = map; -#line 2991 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_set_transformation (self, _tmp3_); + _tmp2_ = map; #line 2991 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp4_) { -#line 23030 "Photo.c" - Alteration* _tmp5_; - Alteration* _tmp6_; + if (photo_set_transformation (self, _tmp2_)) { +#line 23445 "Photo.c" + Alteration* _tmp3_; + Alteration* _tmp4_; #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = alteration_new ("image", "straighten"); + _tmp3_ = alteration_new ("image", "straighten"); #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp6_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp4_); #line 2992 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp6_); -#line 23041 "Photo.c" + _alteration_unref0 (_tmp4_); +#line 23456 "Photo.c" } #line 2987 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 23045 "Photo.c" +#line 23460 "Photo.c" } -static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, int* result_length1) { +static EditingToolsRedeyeInstance* +photo_get_raw_redeye_instances (Photo* self, + int* result_length1) +{ EditingToolsRedeyeInstance* result = NULL; KeyValueMap* map = NULL; KeyValueMap* _tmp0_; @@ -23055,16 +23473,15 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, gint num_points = 0; KeyValueMap* _tmp4_; gint _tmp5_; - gint _tmp6_; EditingToolsRedeyeInstance* res = NULL; - gint _tmp7_; - EditingToolsRedeyeInstance* _tmp8_; + gint _tmp6_; + EditingToolsRedeyeInstance* _tmp7_; gint res_length1; gint _res_size_; GdkPoint default_point = {0}; - GdkPoint _tmp9_ = {0}; - EditingToolsRedeyeInstance* _tmp47_; - gint _tmp47__length1; + GdkPoint _tmp8_ = {0}; + EditingToolsRedeyeInstance* _tmp45_; + gint _tmp45__length1; #line 2997 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 2998 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23075,7 +23492,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, _tmp1_ = map; #line 2999 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 23077 "Photo.c" +#line 23494 "Photo.c" EditingToolsRedeyeInstance* _tmp2_; EditingToolsRedeyeInstance* _tmp3_; gint _tmp3__length1; @@ -23089,7 +23506,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, if (result_length1) { #line 3000 "/home/jens/Source/shotwell/src/Photo.vala" *result_length1 = _tmp3__length1; -#line 23091 "Photo.c" +#line 23508 "Photo.c" } #line 3000 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp3_; @@ -23097,247 +23514,244 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, _key_value_map_unref0 (map); #line 3000 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23099 "Photo.c" +#line 23516 "Photo.c" } #line 3002 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; #line 3002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1); -#line 3002 "/home/jens/Source/shotwell/src/Photo.vala" - num_points = _tmp5_; + num_points = key_value_map_get_int (_tmp4_, "num_points", -1); #line 3003 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = num_points; + _tmp5_ = num_points; #line 3003 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp6_ > 0, "num_points > 0"); + _vala_assert (_tmp5_ > 0, "num_points > 0"); #line 3005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = num_points; + _tmp6_ = num_points; #line 3005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_new0 (EditingToolsRedeyeInstance, _tmp7_); + _tmp7_ = g_new0 (EditingToolsRedeyeInstance, _tmp6_); #line 3005 "/home/jens/Source/shotwell/src/Photo.vala" - res = _tmp8_; + res = _tmp7_; #line 3005 "/home/jens/Source/shotwell/src/Photo.vala" - res_length1 = _tmp7_; + res_length1 = _tmp6_; #line 3005 "/home/jens/Source/shotwell/src/Photo.vala" _res_size_ = res_length1; #line 3007 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_.x = 0; + _tmp8_.x = 0; #line 3007 "/home/jens/Source/shotwell/src/Photo.vala" - default_point = _tmp9_; + default_point = _tmp8_; #line 3008 "/home/jens/Source/shotwell/src/Photo.vala" default_point.x = -1; #line 3009 "/home/jens/Source/shotwell/src/Photo.vala" default_point.y = -1; -#line 23129 "Photo.c" +#line 23544 "Photo.c" { gint i = 0; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" i = 0; -#line 23134 "Photo.c" +#line 23549 "Photo.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp9_ = FALSE; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = TRUE; + _tmp9_ = TRUE; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 23141 "Photo.c" +#line 23556 "Photo.c" + gint _tmp11_; gint _tmp12_; - gint _tmp13_; gchar* center_key = NULL; - gint _tmp14_; - gchar* _tmp15_; + gint _tmp13_; + gchar* _tmp14_; gchar* radius_key = NULL; - gint _tmp16_; - gchar* _tmp17_; - EditingToolsRedeyeInstance* _tmp18_; - gint _tmp18__length1; - gint _tmp19_; - KeyValueMap* _tmp20_; - const gchar* _tmp21_; - GdkPoint _tmp22_; - GdkPoint _tmp23_ = {0}; - EditingToolsRedeyeInstance* _tmp24_; - gint _tmp24__length1; - gint _tmp25_; - EditingToolsRedeyeInstance _tmp26_; - GdkPoint _tmp27_; - gint _tmp28_; - GdkPoint _tmp29_; - gint _tmp30_; - EditingToolsRedeyeInstance* _tmp31_; - gint _tmp31__length1; - gint _tmp32_; - EditingToolsRedeyeInstance _tmp33_; - GdkPoint _tmp34_; - gint _tmp35_; - GdkPoint _tmp36_; - gint _tmp37_; - EditingToolsRedeyeInstance* _tmp38_; - gint _tmp38__length1; - gint _tmp39_; - KeyValueMap* _tmp40_; - const gchar* _tmp41_; + gint _tmp15_; + gchar* _tmp16_; + EditingToolsRedeyeInstance* _tmp17_; + gint _tmp17__length1; + gint _tmp18_; + KeyValueMap* _tmp19_; + const gchar* _tmp20_; + GdkPoint _tmp21_; + GdkPoint _tmp22_ = {0}; + EditingToolsRedeyeInstance* _tmp23_; + gint _tmp23__length1; + gint _tmp24_; + EditingToolsRedeyeInstance _tmp25_; + GdkPoint _tmp26_; + gint _tmp27_; + GdkPoint _tmp28_; + gint _tmp29_; + EditingToolsRedeyeInstance* _tmp30_; + gint _tmp30__length1; + gint _tmp31_; + EditingToolsRedeyeInstance _tmp32_; + GdkPoint _tmp33_; + gint _tmp34_; + GdkPoint _tmp35_; + gint _tmp36_; + EditingToolsRedeyeInstance* _tmp37_; + gint _tmp37__length1; + gint _tmp38_; + KeyValueMap* _tmp39_; + const gchar* _tmp40_; + EditingToolsRedeyeInstance* _tmp41_; + gint _tmp41__length1; gint _tmp42_; - EditingToolsRedeyeInstance* _tmp43_; - gint _tmp43__length1; + EditingToolsRedeyeInstance _tmp43_; gint _tmp44_; - EditingToolsRedeyeInstance _tmp45_; - gint _tmp46_; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp10_) { -#line 23186 "Photo.c" - gint _tmp11_; + if (!_tmp9_) { +#line 23600 "Photo.c" + gint _tmp10_; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = i; + _tmp10_ = i; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - i = _tmp11_ + 1; -#line 23192 "Photo.c" + i = _tmp10_ + 1; +#line 23606 "Photo.c" } #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = FALSE; + _tmp9_ = FALSE; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = i; + _tmp11_ = i; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = num_points; + _tmp12_ = num_points; #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp12_ < _tmp13_)) { + if (!(_tmp11_ < _tmp12_)) { #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 23204 "Photo.c" +#line 23618 "Photo.c" } #line 3012 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = i; + _tmp13_ = i; #line 3012 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = g_strdup_printf ("center%d", _tmp14_); + _tmp14_ = g_strdup_printf ("center%d", _tmp13_); #line 3012 "/home/jens/Source/shotwell/src/Photo.vala" - center_key = _tmp15_; + center_key = _tmp14_; #line 3013 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = i; + _tmp15_ = i; #line 3013 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = g_strdup_printf ("radius%d", _tmp16_); + _tmp16_ = g_strdup_printf ("radius%d", _tmp15_); #line 3013 "/home/jens/Source/shotwell/src/Photo.vala" - radius_key = _tmp17_; + radius_key = _tmp16_; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = res; + _tmp17_ = res; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18__length1 = res_length1; + _tmp17__length1 = res_length1; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = i; + _tmp18_ = i; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = map; + _tmp19_ = map; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = center_key; + _tmp20_ = center_key; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = default_point; + _tmp21_ = default_point; #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_get_point (_tmp20_, _tmp21_, &_tmp22_, &_tmp23_); + key_value_map_get_point (_tmp19_, _tmp20_, &_tmp21_, &_tmp22_); #line 3015 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_[_tmp19_].center = _tmp23_; + _tmp17_[_tmp18_].center = _tmp22_; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = res; + _tmp23_ = res; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24__length1 = res_length1; + _tmp23__length1 = res_length1; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = i; + _tmp24_ = i; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp24_[_tmp25_]; + _tmp25_ = _tmp23_[_tmp24_]; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_.center; + _tmp26_ = _tmp25_.center; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_.x; + _tmp27_ = _tmp26_.x; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = default_point; + _tmp28_ = default_point; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_.x; + _tmp29_ = _tmp28_.x; #line 3016 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp28_ != _tmp30_, "res[i].center.x != default_point.x"); + _vala_assert (_tmp27_ != _tmp29_, "res[i].center.x != default_point.x"); #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = res; + _tmp30_ = res; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31__length1 = res_length1; + _tmp30__length1 = res_length1; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = i; + _tmp31_ = i; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp31_[_tmp32_]; + _tmp32_ = _tmp30_[_tmp31_]; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_.center; + _tmp33_ = _tmp32_.center; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_.y; + _tmp34_ = _tmp33_.y; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = default_point; + _tmp35_ = default_point; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_.y; + _tmp36_ = _tmp35_.y; #line 3017 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp35_ != _tmp37_, "res[i].center.y != default_point.y"); + _vala_assert (_tmp34_ != _tmp36_, "res[i].center.y != default_point.y"); #line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = res; + _tmp37_ = res; #line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38__length1 = res_length1; + _tmp37__length1 = res_length1; #line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = i; + _tmp38_ = i; #line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = map; + _tmp39_ = map; #line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = radius_key; + _tmp40_ = radius_key; #line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = key_value_map_get_int (_tmp40_, _tmp41_, -1); -#line 3019 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_[_tmp39_].radius = _tmp42_; + _tmp37_[_tmp38_].radius = key_value_map_get_int (_tmp39_, _tmp40_, -1); #line 3020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = res; + _tmp41_ = res; #line 3020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43__length1 = res_length1; + _tmp41__length1 = res_length1; #line 3020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = i; + _tmp42_ = i; #line 3020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _tmp43_[_tmp44_]; + _tmp43_ = _tmp41_[_tmp42_]; #line 3020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = _tmp45_.radius; + _tmp44_ = _tmp43_.radius; #line 3020 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp46_ != -1, "res[i].radius != -1"); + _vala_assert (_tmp44_ != -1, "res[i].radius != -1"); #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (radius_key); #line 3011 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (center_key); -#line 23300 "Photo.c" +#line 23712 "Photo.c" } } } #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = res; + _tmp45_ = res; #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47__length1 = res_length1; + _tmp45__length1 = res_length1; #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" if (result_length1) { #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" - *result_length1 = _tmp47__length1; -#line 23312 "Photo.c" + *result_length1 = _tmp45__length1; +#line 23724 "Photo.c" } #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp47_; + result = _tmp45_; #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); #line 3023 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23320 "Photo.c" +#line 23732 "Photo.c" } -gboolean photo_has_redeye_transformations (Photo* self) { +gboolean +photo_has_redeye_transformations (Photo* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 3026 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 3027 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_has_transformation (self, "redeye"); -#line 3027 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_has_transformation (self, "redeye"); #line 3027 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23335 "Photo.c" +#line 23746 "Photo.c" } -void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) { +void +photo_add_redeye_instance (Photo* self, + EditingToolsRedeyeInstance* redeye) +{ KeyValueMap* map = NULL; KeyValueMap* _tmp0_; KeyValueMap* _tmp1_; @@ -23345,25 +23759,23 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) KeyValueMap* _tmp4_; gint _tmp5_; gint _tmp6_; - gint _tmp7_; gchar* radius_key = NULL; - gint _tmp8_; - gchar* _tmp9_; + gint _tmp7_; + gchar* _tmp8_; gchar* center_key = NULL; - gint _tmp10_; - gchar* _tmp11_; - KeyValueMap* _tmp12_; - const gchar* _tmp13_; - EditingToolsRedeyeInstance _tmp14_; - gint _tmp15_; - KeyValueMap* _tmp16_; - const gchar* _tmp17_; - EditingToolsRedeyeInstance _tmp18_; - GdkPoint _tmp19_; - KeyValueMap* _tmp20_; - gint _tmp21_; - KeyValueMap* _tmp22_; - gboolean _tmp23_; + gint _tmp9_; + gchar* _tmp10_; + KeyValueMap* _tmp11_; + const gchar* _tmp12_; + EditingToolsRedeyeInstance _tmp13_; + gint _tmp14_; + KeyValueMap* _tmp15_; + const gchar* _tmp16_; + EditingToolsRedeyeInstance _tmp17_; + GdkPoint _tmp18_; + KeyValueMap* _tmp19_; + gint _tmp20_; + KeyValueMap* _tmp21_; #line 3031 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 3031 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23376,7 +23788,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) _tmp1_ = map; #line 3033 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_ == NULL) { -#line 23378 "Photo.c" +#line 23790 "Photo.c" KeyValueMap* _tmp2_; KeyValueMap* _tmp3_; #line 3034 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23389,78 +23801,74 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) _tmp3_ = map; #line 3035 "/home/jens/Source/shotwell/src/Photo.vala" key_value_map_set_int (_tmp3_, "num_points", 0); -#line 23391 "Photo.c" +#line 23803 "Photo.c" } #line 3038 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = map; #line 3038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1); -#line 3038 "/home/jens/Source/shotwell/src/Photo.vala" - num_points = _tmp5_; + num_points = key_value_map_get_int (_tmp4_, "num_points", -1); #line 3039 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = num_points; + _tmp5_ = num_points; #line 3039 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp6_ >= 0, "num_points >= 0"); + _vala_assert (_tmp5_ >= 0, "num_points >= 0"); #line 3041 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = num_points; + _tmp6_ = num_points; #line 3041 "/home/jens/Source/shotwell/src/Photo.vala" - num_points = _tmp7_ + 1; + num_points = _tmp6_ + 1; #line 3043 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = num_points; + _tmp7_ = num_points; #line 3043 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = g_strdup_printf ("radius%d", _tmp8_ - 1); + _tmp8_ = g_strdup_printf ("radius%d", _tmp7_ - 1); #line 3043 "/home/jens/Source/shotwell/src/Photo.vala" - radius_key = _tmp9_; + radius_key = _tmp8_; #line 3044 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = num_points; + _tmp9_ = num_points; #line 3044 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = g_strdup_printf ("center%d", _tmp10_ - 1); + _tmp10_ = g_strdup_printf ("center%d", _tmp9_ - 1); #line 3044 "/home/jens/Source/shotwell/src/Photo.vala" - center_key = _tmp11_; + center_key = _tmp10_; #line 3046 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = map; + _tmp11_ = map; #line 3046 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = radius_key; + _tmp12_ = radius_key; #line 3046 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = *redeye; + _tmp13_ = *redeye; #line 3046 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_.radius; + _tmp14_ = _tmp13_.radius; #line 3046 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_set_int (_tmp12_, _tmp13_, _tmp15_); + key_value_map_set_int (_tmp11_, _tmp12_, _tmp14_); #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = map; + _tmp15_ = map; #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = center_key; + _tmp16_ = center_key; #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = *redeye; + _tmp17_ = *redeye; #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_.center; + _tmp18_ = _tmp17_.center; #line 3047 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_set_point (_tmp16_, _tmp17_, &_tmp19_); + key_value_map_set_point (_tmp15_, _tmp16_, &_tmp18_); #line 3049 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = map; + _tmp19_ = map; #line 3049 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = num_points; + _tmp20_ = num_points; #line 3049 "/home/jens/Source/shotwell/src/Photo.vala" - key_value_map_set_int (_tmp20_, "num_points", _tmp21_); -#line 3051 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = map; + key_value_map_set_int (_tmp19_, "num_points", _tmp20_); #line 3051 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo_set_transformation (self, _tmp22_); + _tmp21_ = map; #line 3051 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp23_) { -#line 23451 "Photo.c" - Alteration* _tmp24_; - Alteration* _tmp25_; + if (photo_set_transformation (self, _tmp21_)) { +#line 23859 "Photo.c" + Alteration* _tmp22_; + Alteration* _tmp23_; #line 3052 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = alteration_new ("image", "redeye"); + _tmp22_ = alteration_new ("image", "redeye"); #line 3052 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 3052 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_); #line 3052 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp25_); -#line 23462 "Photo.c" + _alteration_unref0 (_tmp23_); +#line 23870 "Photo.c" } #line 3031 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (center_key); @@ -23468,11 +23876,17 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) _g_free0 (radius_key); #line 3031 "/home/jens/Source/shotwell/src/Photo.vala" _key_value_map_unref0 (map); -#line 23470 "Photo.c" +#line 23878 "Photo.c" } -static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling, PhotoException exceptions, Dimensions* scaled_image, Dimensions* scaled_to_viewport) { +static gboolean +photo_calculate_pixbuf_dimensions (Photo* self, + Scaling* scaling, + PhotoException exceptions, + Dimensions* scaled_image, + Dimensions* scaled_to_viewport) +{ Dimensions _vala_scaled_image = {0}; Dimensions _vala_scaled_to_viewport = {0}; gboolean result = FALSE; @@ -23481,109 +23895,105 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 3066 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, FALSE); -#line 23483 "Photo.c" +#line 23897 "Photo.c" { PhotoRow* _tmp0_; - gboolean _tmp8_ = FALSE; + gboolean _tmp7_ = FALSE; #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 23491 "Photo.c" +#line 23905 "Photo.c" { Scaling _tmp1_; - PhotoException _tmp2_; + Dimensions _tmp2_ = {0}; Dimensions _tmp3_ = {0}; - Dimensions _tmp4_ = {0}; - gboolean _tmp5_; + gboolean _tmp4_; #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = exceptions; + _tmp4_ = photo_locked_calculate_pixbuf_dimensions (self, &_tmp1_, exceptions, &_tmp2_, &_tmp3_); #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_locked_calculate_pixbuf_dimensions (self, &_tmp1_, _tmp2_, &_tmp3_, &_tmp4_); + _vala_scaled_image = _tmp2_; #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp3_; + _vala_scaled_to_viewport = _tmp3_; #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_to_viewport = _tmp4_; -#line 3070 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp5_; -#line 23510 "Photo.c" + result = _tmp4_; +#line 23921 "Photo.c" { - PhotoRow* _tmp6_; + PhotoRow* _tmp5_; #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->row; + _tmp5_ = self->row; #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 23517 "Photo.c" +#line 23928 "Photo.c" } #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23523 "Photo.c" +#line 23934 "Photo.c" } #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23529 "Photo.c" +#line 23940 "Photo.c" } #line 3070 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23533 "Photo.c" +#line 23944 "Photo.c" } __finally392: { - PhotoRow* _tmp7_; + PhotoRow* _tmp6_; #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = self->row; + _tmp6_ = self->row; #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 23542 "Photo.c" +#line 23953 "Photo.c" } #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" g_clear_error (&_inner_error_); #line 3068 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp8_; -#line 23550 "Photo.c" + return _tmp7_; +#line 23961 "Photo.c" } #line 3066 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3066 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23556 "Photo.c" +#line 23967 "Photo.c" } #line 3066 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3066 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23562 "Photo.c" +#line 23973 "Photo.c" } } -static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling, PhotoException exceptions, Dimensions* scaled_image, Dimensions* scaled_to_viewport) { +static gboolean +photo_locked_calculate_pixbuf_dimensions (Photo* self, + Scaling* scaling, + PhotoException exceptions, + Dimensions* scaled_image, + Dimensions* scaled_to_viewport) +{ Dimensions _vala_scaled_image = {0}; Dimensions _vala_scaled_to_viewport = {0}; gboolean result = FALSE; Dimensions raw = {0}; Dimensions _tmp0_ = {0}; - gboolean _tmp1_; Orientation orientation = 0; - Orientation _tmp4_; - PhotoException _tmp5_; - gboolean _tmp6_; - gboolean _tmp38_; - gboolean _tmp53_ = FALSE; - Dimensions _tmp54_; - gint _tmp55_; - Dimensions _tmp56_; - gint _tmp57_; - gboolean _tmp63_; - gboolean _tmp64_; + gboolean _tmp36_ = FALSE; + Dimensions _tmp37_; + gint _tmp38_; + Dimensions _tmp39_; + gint _tmp40_; #line 3076 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 3076 "/home/jens/Source/shotwell/src/Photo.vala" @@ -23593,415 +24003,362 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* #line 3078 "/home/jens/Source/shotwell/src/Photo.vala" raw = _tmp0_; #line 3080 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = scaling_is_unscaled (scaling); -#line 3080 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { -#line 23598 "Photo.c" + if (scaling_is_unscaled (scaling)) { +#line 24006 "Photo.c" + Dimensions _tmp1_; Dimensions _tmp2_; - Dimensions _tmp3_; #line 3081 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = raw; + _tmp1_ = raw; #line 3081 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp2_; + _vala_scaled_image = _tmp1_; #line 3082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = raw; + _tmp2_ = raw; #line 3082 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_to_viewport = _tmp3_; + _vala_scaled_to_viewport = _tmp2_; #line 3084 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3084 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3084 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23615 "Photo.c" +#line 24023 "Photo.c" } #line 3084 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3084 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23621 "Photo.c" +#line 24029 "Photo.c" } #line 3084 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23625 "Photo.c" +#line 24033 "Photo.c" } #line 3087 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_get_orientation (self); -#line 3087 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp4_; + orientation = photo_get_orientation (self); #line 3092 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&_vala_scaled_image, 0, 0); #line 3093 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&_vala_scaled_to_viewport, 0, 0); #line 3095 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = exceptions; -#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_exception_allows (_tmp5_, PHOTO_EXCEPTION_CROP); -#line 3095 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { -#line 23641 "Photo.c" + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_CROP)) { +#line 24043 "Photo.c" Box crop = {0}; - Box _tmp7_ = {0}; - gboolean _tmp8_; + Box _tmp3_ = {0}; + gboolean _tmp4_; #line 3097 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_get_raw_crop (self, &_tmp7_); + _tmp4_ = photo_get_raw_crop (self, &_tmp3_); #line 3097 "/home/jens/Source/shotwell/src/Photo.vala" - crop = _tmp7_; + crop = _tmp3_; #line 3097 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { -#line 23651 "Photo.c" + if (_tmp4_) { +#line 24053 "Photo.c" Dimensions rotated_raw = {0}; - Dimensions _tmp9_; - PhotoException _tmp10_; - gboolean _tmp11_; + Dimensions _tmp5_; Box scaled_crop = {0}; - Dimensions _tmp19_ = {0}; + Dimensions _tmp13_ = {0}; + Dimensions _tmp14_ = {0}; + Box _tmp15_ = {0}; + Dimensions _tmp16_ = {0}; + gboolean _tmp17_ = FALSE; Dimensions _tmp20_ = {0}; - Box _tmp21_ = {0}; + Dimensions _tmp21_ = {0}; Dimensions _tmp22_ = {0}; - gboolean _tmp23_ = FALSE; - gint _tmp24_; - gint _tmp25_; - Dimensions _tmp30_ = {0}; - Dimensions _tmp31_ = {0}; - Dimensions _tmp32_ = {0}; - PhotoException _tmp33_; - gboolean _tmp34_; #line 3100 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = raw; + _tmp5_ = raw; #line 3100 "/home/jens/Source/shotwell/src/Photo.vala" - rotated_raw = _tmp9_; -#line 3101 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = exceptions; -#line 3101 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_ORIENTATION); + rotated_raw = _tmp5_; #line 3101 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 23679 "Photo.c" - Orientation _tmp12_; - Dimensions _tmp13_; - Box _tmp14_; - Box _tmp15_ = {0}; - Orientation _tmp16_; - Dimensions _tmp17_; - Dimensions _tmp18_ = {0}; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ORIENTATION)) { +#line 24071 "Photo.c" + Orientation _tmp6_; + Dimensions _tmp7_; + Box _tmp8_; + Box _tmp9_ = {0}; + Orientation _tmp10_; + Dimensions _tmp11_; + Dimensions _tmp12_ = {0}; #line 3102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = orientation; + _tmp6_ = orientation; #line 3102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = raw; + _tmp7_ = raw; #line 3102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = crop; + _tmp8_ = crop; #line 3102 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_box (_tmp12_, &_tmp13_, &_tmp14_, &_tmp15_); + orientation_rotate_box (_tmp6_, &_tmp7_, &_tmp8_, &_tmp9_); #line 3102 "/home/jens/Source/shotwell/src/Photo.vala" - crop = _tmp15_; + crop = _tmp9_; #line 3103 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = orientation; + _tmp10_ = orientation; #line 3103 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = raw; + _tmp11_ = raw; #line 3103 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_dimensions (_tmp16_, &_tmp17_, &_tmp18_); + orientation_rotate_dimensions (_tmp10_, &_tmp11_, &_tmp12_); #line 3103 "/home/jens/Source/shotwell/src/Photo.vala" - rotated_raw = _tmp18_; -#line 23705 "Photo.c" + rotated_raw = _tmp12_; +#line 24097 "Photo.c" } #line 3107 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_dimensions (&crop, &_tmp19_); + box_get_dimensions (&crop, &_tmp13_); #line 3107 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_get_scaled_dimensions (scaling, &_tmp19_, &_tmp20_); + scaling_get_scaled_dimensions (scaling, &_tmp13_, &_tmp14_); #line 3107 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_scaled (&crop, &_tmp20_, &_tmp21_); + box_get_scaled (&crop, &_tmp14_, &_tmp15_); #line 3107 "/home/jens/Source/shotwell/src/Photo.vala" - scaled_crop = _tmp21_; + scaled_crop = _tmp15_; #line 3110 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_dimensions (&scaled_crop, &_tmp22_); + box_get_dimensions (&scaled_crop, &_tmp16_); #line 3110 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_to_viewport = _tmp22_; -#line 3113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = box_get_width (&crop); + _vala_scaled_to_viewport = _tmp16_; #line 3113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = box_get_width (&scaled_crop); -#line 3113 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp24_ <= _tmp25_) { -#line 23725 "Photo.c" - gint _tmp26_; - gint _tmp27_; -#line 3114 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = box_get_height (&crop); + if (box_get_width (&crop) <= box_get_width (&scaled_crop)) { #line 3114 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = box_get_height (&scaled_crop); -#line 3114 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp26_ <= _tmp27_; -#line 23734 "Photo.c" + _tmp17_ = box_get_height (&crop) <= box_get_height (&scaled_crop); +#line 24115 "Photo.c" } else { #line 3113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = FALSE; -#line 23738 "Photo.c" + _tmp17_ = FALSE; +#line 24119 "Photo.c" } #line 3113 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp23_) { -#line 23742 "Photo.c" - Dimensions _tmp28_; - Dimensions _tmp29_ = {0}; + if (_tmp17_) { +#line 24123 "Photo.c" + Dimensions _tmp18_; + Dimensions _tmp19_ = {0}; #line 3115 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = raw; + _tmp18_ = raw; #line 3115 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp28_; + _vala_scaled_image = _tmp18_; #line 3116 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_dimensions (&crop, &_tmp29_); + box_get_dimensions (&crop, &_tmp19_); #line 3116 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_to_viewport = _tmp29_; + _vala_scaled_to_viewport = _tmp19_; #line 3118 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3118 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3118 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23759 "Photo.c" +#line 24140 "Photo.c" } #line 3118 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3118 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23765 "Photo.c" +#line 24146 "Photo.c" } #line 3118 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23769 "Photo.c" +#line 24150 "Photo.c" } #line 3123 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_dimensions (&crop, &_tmp30_); + box_get_dimensions (&crop, &_tmp20_); #line 3123 "/home/jens/Source/shotwell/src/Photo.vala" - box_get_dimensions (&scaled_crop, &_tmp31_); + box_get_dimensions (&scaled_crop, &_tmp21_); #line 3123 "/home/jens/Source/shotwell/src/Photo.vala" - dimensions_get_scaled_similar (&rotated_raw, &_tmp30_, &_tmp31_, &_tmp32_); + dimensions_get_scaled_similar (&rotated_raw, &_tmp20_, &_tmp21_, &_tmp22_); #line 3123 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp32_; -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = exceptions; + _vala_scaled_image = _tmp22_; #line 3127 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = photo_exception_allows (_tmp33_, PHOTO_EXCEPTION_ORIENTATION); -#line 3127 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp34_) { -#line 23785 "Photo.c" - Orientation _tmp35_; - Dimensions _tmp36_; - Dimensions _tmp37_ = {0}; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ORIENTATION)) { +#line 24162 "Photo.c" + Orientation _tmp23_; + Dimensions _tmp24_; + Dimensions _tmp25_ = {0}; #line 3128 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = orientation; + _tmp23_ = orientation; #line 3128 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _vala_scaled_image; + _tmp24_ = _vala_scaled_image; #line 3128 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_derotate_dimensions (_tmp35_, &_tmp36_, &_tmp37_); + orientation_derotate_dimensions (_tmp23_, &_tmp24_, &_tmp25_); #line 3128 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp37_; -#line 23797 "Photo.c" + _vala_scaled_image = _tmp25_; +#line 24174 "Photo.c" } } } #line 3133 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = dimensions_has_area (&_vala_scaled_image); -#line 3133 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp38_) { -#line 23805 "Photo.c" + if (!dimensions_has_area (&_vala_scaled_image)) { +#line 24180 "Photo.c" Dimensions rotated_raw = {0}; - Dimensions _tmp39_; - PhotoException _tmp40_; - gboolean _tmp41_; - Dimensions _tmp45_; - Dimensions _tmp46_ = {0}; - Dimensions _tmp47_; - PhotoException _tmp48_; - gboolean _tmp49_; + Dimensions _tmp26_; + Dimensions _tmp30_; + Dimensions _tmp31_ = {0}; + Dimensions _tmp32_; #line 3135 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = raw; + _tmp26_ = raw; #line 3135 "/home/jens/Source/shotwell/src/Photo.vala" - rotated_raw = _tmp39_; -#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = exceptions; -#line 3136 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_ORIENTATION); + rotated_raw = _tmp26_; #line 3136 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp41_) { -#line 23825 "Photo.c" - Orientation _tmp42_; - Dimensions _tmp43_; - Dimensions _tmp44_ = {0}; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ORIENTATION)) { +#line 24192 "Photo.c" + Orientation _tmp27_; + Dimensions _tmp28_; + Dimensions _tmp29_ = {0}; #line 3137 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = orientation; + _tmp27_ = orientation; #line 3137 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = raw; + _tmp28_ = raw; #line 3137 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_dimensions (_tmp42_, &_tmp43_, &_tmp44_); + orientation_rotate_dimensions (_tmp27_, &_tmp28_, &_tmp29_); #line 3137 "/home/jens/Source/shotwell/src/Photo.vala" - rotated_raw = _tmp44_; -#line 23837 "Photo.c" + rotated_raw = _tmp29_; +#line 24204 "Photo.c" } #line 3139 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = rotated_raw; + _tmp30_ = rotated_raw; #line 3139 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_get_scaled_dimensions (scaling, &_tmp45_, &_tmp46_); + scaling_get_scaled_dimensions (scaling, &_tmp30_, &_tmp31_); #line 3139 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp46_; + _vala_scaled_image = _tmp31_; #line 3140 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _vala_scaled_image; + _tmp32_ = _vala_scaled_image; #line 3140 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_to_viewport = _tmp47_; -#line 3143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = exceptions; -#line 3143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = photo_exception_allows (_tmp48_, PHOTO_EXCEPTION_ORIENTATION); + _vala_scaled_to_viewport = _tmp32_; #line 3143 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp49_) { -#line 23855 "Photo.c" - Orientation _tmp50_; - Dimensions _tmp51_; - Dimensions _tmp52_ = {0}; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ORIENTATION)) { +#line 24218 "Photo.c" + Orientation _tmp33_; + Dimensions _tmp34_; + Dimensions _tmp35_ = {0}; #line 3144 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = orientation; + _tmp33_ = orientation; #line 3144 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _vala_scaled_image; + _tmp34_ = _vala_scaled_image; #line 3144 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_derotate_dimensions (_tmp50_, &_tmp51_, &_tmp52_); + orientation_derotate_dimensions (_tmp33_, &_tmp34_, &_tmp35_); #line 3144 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp52_; -#line 23867 "Photo.c" + _vala_scaled_image = _tmp35_; +#line 24230 "Photo.c" } } #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = _vala_scaled_image; + _tmp37_ = _vala_scaled_image; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = _tmp54_.width; + _tmp38_ = _tmp37_.width; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = raw; + _tmp39_ = raw; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = _tmp56_.width; + _tmp40_ = _tmp39_.width; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp55_ >= _tmp57_) { -#line 23880 "Photo.c" - Dimensions _tmp58_; - gint _tmp59_; - Dimensions _tmp60_; - gint _tmp61_; + if (_tmp38_ >= _tmp40_) { +#line 24243 "Photo.c" + Dimensions _tmp41_; + gint _tmp42_; + Dimensions _tmp43_; + gint _tmp44_; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _vala_scaled_image; + _tmp41_ = _vala_scaled_image; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = _tmp58_.height; + _tmp42_ = _tmp41_.height; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = raw; + _tmp43_ = raw; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _tmp60_.height; + _tmp44_ = _tmp43_.height; #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp59_ >= _tmp61_; -#line 23895 "Photo.c" + _tmp36_ = _tmp42_ >= _tmp44_; +#line 24258 "Photo.c" } else { #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = FALSE; -#line 23899 "Photo.c" + _tmp36_ = FALSE; +#line 24262 "Photo.c" } #line 3148 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp53_) { -#line 23903 "Photo.c" - Dimensions _tmp62_; + if (_tmp36_) { +#line 24266 "Photo.c" + Dimensions _tmp45_; #line 3149 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = raw; + _tmp45_ = raw; #line 3149 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_scaled_image = _tmp62_; + _vala_scaled_image = _tmp45_; #line 3151 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3151 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3151 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23915 "Photo.c" +#line 24278 "Photo.c" } #line 3151 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3151 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23921 "Photo.c" +#line 24284 "Photo.c" } #line 3151 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23925 "Photo.c" +#line 24288 "Photo.c" } #line 3154 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = dimensions_has_area (&_vala_scaled_image); -#line 3154 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp63_, "scaled_image.has_area()"); -#line 3155 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = dimensions_has_area (&_vala_scaled_to_viewport); + _vala_assert (dimensions_has_area (&_vala_scaled_image), "scaled_image.has_area()"); #line 3155 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp64_, "scaled_to_viewport.has_area()"); + _vala_assert (dimensions_has_area (&_vala_scaled_to_viewport), "scaled_to_viewport.has_area()"); #line 3157 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 3157 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_image) { #line 3157 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_image = _vala_scaled_image; -#line 23941 "Photo.c" +#line 24300 "Photo.c" } #line 3157 "/home/jens/Source/shotwell/src/Photo.vala" if (scaled_to_viewport) { #line 3157 "/home/jens/Source/shotwell/src/Photo.vala" *scaled_to_viewport = _vala_scaled_to_viewport; -#line 23947 "Photo.c" +#line 24306 "Photo.c" } #line 3157 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 23951 "Photo.c" +#line 24310 "Photo.c" } -static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error) { +static GdkPixbuf* +photo_load_raw_pixbuf (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error) +{ GdkPixbuf* result = NULL; PhotoFileReader* loader = NULL; - BackingFetchMode _tmp0_; - PhotoFileReader* _tmp1_; - gboolean _tmp2_; + PhotoFileReader* _tmp0_; Dimensions scaled_image = {0}; Dimensions scaled_to_viewport = {0}; gboolean is_scaled = FALSE; - Scaling _tmp7_; - PhotoException _tmp8_; - Dimensions _tmp9_ = {0}; - Dimensions _tmp10_ = {0}; - gboolean _tmp11_; - gboolean _tmp12_; + Scaling _tmp5_; + Dimensions _tmp6_ = {0}; + Dimensions _tmp7_ = {0}; + gboolean _tmp8_; + gboolean _tmp9_; GdkPixbuf* pixbuf = NULL; - PhotoFileReader* _tmp17_; - Dimensions _tmp18_ = {0}; - Dimensions _tmp19_; - GdkPixbuf* _tmp20_; - GdkPixbuf* _tmp21_; - Dimensions _tmp22_ = {0}; - gboolean _tmp23_; + PhotoFileReader* _tmp14_; + Dimensions _tmp15_ = {0}; + Dimensions _tmp16_; + GdkPixbuf* _tmp17_; + GdkPixbuf* _tmp18_; + Dimensions _tmp19_ = {0}; GError * _inner_error_ = NULL; #line 3163 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 3163 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); #line 3166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = fetch_mode; + _tmp0_ = photo_get_backing_reader (self, fetch_mode); #line 3166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_backing_reader (self, _tmp0_); -#line 3166 "/home/jens/Source/shotwell/src/Photo.vala" - loader = _tmp1_; -#line 3169 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = scaling_is_unscaled (scaling); + loader = _tmp0_; #line 3169 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { -#line 23993 "Photo.c" - GdkPixbuf* _tmp3_ = NULL; - PhotoFileReader* _tmp4_; - GdkPixbuf* _tmp5_; - GdkPixbuf* _tmp6_; + if (scaling_is_unscaled (scaling)) { +#line 24350 "Photo.c" + GdkPixbuf* _tmp1_ = NULL; + PhotoFileReader* _tmp2_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = loader; + _tmp2_ = loader; #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_file_reader_unscaled_read (_tmp4_, &_inner_error_); + _tmp3_ = photo_file_reader_unscaled_read (_tmp2_, &_inner_error_); #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp5_; + _tmp1_ = _tmp3_; #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24010,49 +24367,47 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _photo_file_adapter_unref0 (loader); #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24012 "Photo.c" +#line 24369 "Photo.c" } #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp3_; + _tmp4_ = _tmp1_; #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = NULL; + _tmp1_ = NULL; #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp6_; + result = _tmp4_; #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); #line 3174 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24026 "Photo.c" +#line 24383 "Photo.c" } #line 3179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = *scaling; -#line 3179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = exceptions; + _tmp5_ = *scaling; #line 3179 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_calculate_pixbuf_dimensions (self, &_tmp7_, _tmp8_, &_tmp9_, &_tmp10_); + _tmp8_ = photo_calculate_pixbuf_dimensions (self, &_tmp5_, exceptions, &_tmp6_, &_tmp7_); #line 3179 "/home/jens/Source/shotwell/src/Photo.vala" - scaled_image = _tmp9_; + scaled_image = _tmp6_; #line 3179 "/home/jens/Source/shotwell/src/Photo.vala" - scaled_to_viewport = _tmp10_; + scaled_to_viewport = _tmp7_; #line 3179 "/home/jens/Source/shotwell/src/Photo.vala" - is_scaled = _tmp11_; + is_scaled = _tmp8_; #line 3181 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = is_scaled; + _tmp9_ = is_scaled; #line 3181 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp12_) { -#line 24044 "Photo.c" - GdkPixbuf* _tmp13_ = NULL; - PhotoFileReader* _tmp14_; - GdkPixbuf* _tmp15_; - GdkPixbuf* _tmp16_; + if (!_tmp9_) { +#line 24399 "Photo.c" + GdkPixbuf* _tmp10_ = NULL; + PhotoFileReader* _tmp11_; + GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp13_; #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = loader; + _tmp11_ = loader; #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_file_reader_unscaled_read (_tmp14_, &_inner_error_); + _tmp12_ = photo_file_reader_unscaled_read (_tmp11_, &_inner_error_); #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp15_; + _tmp10_ = _tmp12_; #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24061,32 +24416,32 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _photo_file_adapter_unref0 (loader); #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24063 "Photo.c" +#line 24418 "Photo.c" } #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp13_; + _tmp13_ = _tmp10_; #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = NULL; + _tmp10_ = NULL; #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp16_; + result = _tmp13_; #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp10_); #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); #line 3186 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24077 "Photo.c" +#line 24432 "Photo.c" } #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = loader; + _tmp14_ = loader; #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_raw_dimensions (self, &_tmp18_); + photo_get_raw_dimensions (self, &_tmp15_); #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = scaled_image; + _tmp16_ = scaled_image; #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = photo_file_reader_scaled_read (_tmp17_, &_tmp18_, &_tmp19_, &_inner_error_); + _tmp17_ = photo_file_reader_scaled_read (_tmp14_, &_tmp15_, &_tmp16_, &_inner_error_); #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp20_; + pixbuf = _tmp17_; #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24095,33 +24450,35 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc _photo_file_adapter_unref0 (loader); #line 3189 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24097 "Photo.c" +#line 24452 "Photo.c" } #line 3197 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = pixbuf; -#line 3197 "/home/jens/Source/shotwell/src/Photo.vala" - dimensions_for_pixbuf (_tmp21_, &_tmp22_); + _tmp18_ = pixbuf; #line 3197 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = dimensions_approx_equals (&scaled_image, &_tmp22_, PHOTO_SCALING_FUDGE); + dimensions_for_pixbuf (_tmp18_, &_tmp19_); #line 3197 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp23_, "scaled_image.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)"); + _vala_assert (dimensions_approx_equals (&scaled_image, &_tmp19_, PHOTO_SCALING_FUDGE), "scaled_image.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)"); #line 3199 "/home/jens/Source/shotwell/src/Photo.vala" result = pixbuf; #line 3199 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (loader); #line 3199 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24113 "Photo.c" +#line 24466 "Photo.c" } -GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error) { +GdkPixbuf* +photo_get_master_pixbuf (Photo* self, + Scaling* scaling, + gboolean rotate, + GError** error) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; Scaling _tmp1_; - gboolean _tmp2_; + GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; GError * _inner_error_ = NULL; #line 3204 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); @@ -24130,40 +24487,42 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = rotate; + _tmp2_ = photo_get_untransformed_pixbuf (self, &_tmp1_, rotate, BACKING_FETCH_MODE_MASTER, &_inner_error_); #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_MASTER, &_inner_error_); -#line 3205 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_; + _tmp0_ = _tmp2_; #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24143 "Photo.c" +#line 24498 "Photo.c" } #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp0_; + _tmp3_ = _tmp0_; #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); #line 3205 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24155 "Photo.c" +#line 24510 "Photo.c" } -GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error) { +GdkPixbuf* +photo_get_unmodified_pixbuf (Photo* self, + Scaling* scaling, + gboolean rotate, + GError** error) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; Scaling _tmp1_; - gboolean _tmp2_; + GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; GError * _inner_error_ = NULL; #line 3209 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); @@ -24172,61 +24531,62 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = rotate; + _tmp2_ = photo_get_untransformed_pixbuf (self, &_tmp1_, rotate, BACKING_FETCH_MODE_UNMODIFIED, &_inner_error_); #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_UNMODIFIED, &_inner_error_); -#line 3210 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_; + _tmp0_ = _tmp2_; #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24185 "Photo.c" +#line 24542 "Photo.c" } #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp0_; + _tmp3_ = _tmp0_; #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); #line 3210 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24197 "Photo.c" +#line 24554 "Photo.c" } -static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, BackingFetchMode fetch_mode, GError** error) { +static GdkPixbuf* +photo_get_untransformed_pixbuf (Photo* self, + Scaling* scaling, + gboolean rotate, + BackingFetchMode fetch_mode, + GError** error) +{ GdkPixbuf* result = NULL; Dimensions scaled_image = {0}; Dimensions scaled_to_viewport = {0}; Orientation original_orientation = 0; GdkPixbuf* pixbuf = NULL; - Scaling _tmp6_; - BackingFetchMode _tmp7_; - GdkPixbuf* _tmp8_; - gboolean _tmp9_; + Scaling _tmp5_; + GdkPixbuf* _tmp6_; GError * _inner_error_ = NULL; #line 3214 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 3214 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 24216 "Photo.c" +#line 24577 "Photo.c" { PhotoRow* _tmp0_; #line 3228 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 3228 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 24223 "Photo.c" +#line 24584 "Photo.c" { Scaling _tmp1_; Dimensions _tmp2_ = {0}; Dimensions _tmp3_ = {0}; - Orientation _tmp4_; #line 3229 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = *scaling; #line 3229 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24236,19 +24596,17 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, #line 3229 "/home/jens/Source/shotwell/src/Photo.vala" scaled_to_viewport = _tmp3_; #line 3231 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_get_original_orientation (self); -#line 3231 "/home/jens/Source/shotwell/src/Photo.vala" - original_orientation = _tmp4_; -#line 24241 "Photo.c" + original_orientation = photo_get_original_orientation (self); +#line 24599 "Photo.c" } __finally393: { - PhotoRow* _tmp5_; + PhotoRow* _tmp4_; #line 3228 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->row; + _tmp4_ = self->row; #line 3228 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 24250 "Photo.c" +#line 24608 "Photo.c" } #line 3228 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -24256,51 +24614,51 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling, g_propagate_error (error, _inner_error_); #line 3228 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24258 "Photo.c" +#line 24616 "Photo.c" } } #line 3235 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = *scaling; + _tmp5_ = *scaling; #line 3235 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = fetch_mode; + _tmp6_ = photo_load_raw_pixbuf (self, &_tmp5_, PHOTO_EXCEPTION_NONE, fetch_mode, &_inner_error_); #line 3235 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo_load_raw_pixbuf (self, &_tmp6_, PHOTO_EXCEPTION_NONE, _tmp7_, &_inner_error_); -#line 3235 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp8_; + pixbuf = _tmp6_; #line 3235 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3235 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3235 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24275 "Photo.c" +#line 24631 "Photo.c" } #line 3241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = rotate; -#line 3241 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp9_) { -#line 24281 "Photo.c" - GdkPixbuf* _tmp10_; - GdkPixbuf* _tmp11_; + if (rotate) { +#line 24635 "Photo.c" + GdkPixbuf* _tmp7_; + GdkPixbuf* _tmp8_; #line 3242 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = pixbuf; + _tmp7_ = pixbuf; #line 3242 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = orientation_rotate_pixbuf (original_orientation, _tmp10_); + _tmp8_ = orientation_rotate_pixbuf (original_orientation, _tmp7_); #line 3242 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3242 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp11_; -#line 24292 "Photo.c" + pixbuf = _tmp8_; +#line 24646 "Photo.c" } #line 3251 "/home/jens/Source/shotwell/src/Photo.vala" result = pixbuf; #line 3251 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24298 "Photo.c" +#line 24652 "Photo.c" } -static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GError** error) { +static GdkPixbuf* +photo_real_get_pixbuf (PhotoSource* base, + Scaling* scaling, + GError** error) +{ Photo * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; @@ -24324,7 +24682,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE g_propagate_error (error, _inner_error_); #line 3255 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24326 "Photo.c" +#line 24684 "Photo.c" } #line 3255 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp0_; @@ -24336,7 +24694,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE _g_object_unref0 (_tmp0_); #line 3255 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24338 "Photo.c" +#line 24696 "Photo.c" } @@ -24355,35 +24713,43 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE * and dropping excessive pixbufs from the LRU. Locating a Photo "touches" the pixbuf, i.e. * it moves to the head of the LRU. */ -static gpointer _photo_cached_pixbuf_ref0 (gpointer self) { +static gpointer +_photo_cached_pixbuf_ref0 (gpointer self) +{ #line 3290 "/home/jens/Source/shotwell/src/Photo.vala" return self ? photo_cached_pixbuf_ref (self) : NULL; -#line 24360 "Photo.c" +#line 24720 "Photo.c" } -static gboolean _photo_trim_source_pixbuf_cache_gsource_func (gpointer self) { +static gboolean +_photo_trim_source_pixbuf_cache_gsource_func (gpointer self) +{ gboolean result; result = photo_trim_source_pixbuf_cache (); #line 3342 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24369 "Photo.c" +#line 24731 "Photo.c" } -static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, GError** error) { +static GdkPixbuf* +photo_run_source_pixbuf_cache (Photo* locate, + gboolean keep, + GError** error) +{ GdkPixbuf* result = NULL; GError * _inner_error_ = NULL; #line 3273 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((locate == NULL) || IS_PHOTO (locate), NULL); -#line 24378 "Photo.c" +#line 24744 "Photo.c" { GeeLinkedList* _tmp0_; #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_source_pixbuf_cache; #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&__lock_photo_source_pixbuf_cache); -#line 24385 "Photo.c" +#line 24751 "Photo.c" { PhotoCachedPixbuf* found = NULL; gdouble min_elapsed = 0.0; @@ -24391,18 +24757,18 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G GeeIterator* iter = NULL; GeeLinkedList* _tmp1_; GeeIterator* _tmp2_; - gboolean _tmp29_ = FALSE; - gboolean _tmp30_ = FALSE; - PhotoCachedPixbuf* _tmp31_; - gboolean _tmp43_ = FALSE; - PhotoCachedPixbuf* _tmp44_; - guint _tmp59_; - GeeLinkedList* _tmp61_; - gint _tmp62_; - gint _tmp63_; - GdkPixbuf* _tmp69_ = NULL; - PhotoCachedPixbuf* _tmp70_; - GdkPixbuf* _tmp73_; + gboolean _tmp23_ = FALSE; + gboolean _tmp24_ = FALSE; + PhotoCachedPixbuf* _tmp25_; + gboolean _tmp33_ = FALSE; + PhotoCachedPixbuf* _tmp34_; + guint _tmp47_; + GeeLinkedList* _tmp49_; + gint _tmp50_; + gint _tmp51_; + GdkPixbuf* _tmp55_ = NULL; + PhotoCachedPixbuf* _tmp56_; + GdkPixbuf* _tmp59_; #line 3275 "/home/jens/Source/shotwell/src/Photo.vala" found = NULL; #line 3279 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24417,412 +24783,369 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G iter = _tmp2_; #line 3282 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 24419 "Photo.c" +#line 24785 "Photo.c" GeeIterator* _tmp3_; - gboolean _tmp4_; PhotoCachedPixbuf* cached_pixbuf = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp4_; + gpointer _tmp5_; gdouble elapsed = 0.0; - PhotoCachedPixbuf* _tmp7_; - GTimer* _tmp8_; - gdouble _tmp9_; - gdouble _tmp10_; - gboolean _tmp11_ = FALSE; - Photo* _tmp12_; + PhotoCachedPixbuf* _tmp6_; + GTimer* _tmp7_; + gdouble _tmp8_; + gboolean _tmp9_ = FALSE; #line 3282 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = iter; #line 3282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 3282 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp3_)) { #line 3282 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 24440 "Photo.c" +#line 24801 "Photo.c" } #line 3283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = iter; + _tmp4_ = iter; #line 3283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 3283 "/home/jens/Source/shotwell/src/Photo.vala" - cached_pixbuf = (PhotoCachedPixbuf*) _tmp6_; + cached_pixbuf = (PhotoCachedPixbuf*) _tmp5_; #line 3285 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = cached_pixbuf; + _tmp6_ = cached_pixbuf; #line 3285 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->last_touched; + _tmp7_ = _tmp6_->last_touched; #line 3285 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = g_timer_elapsed (_tmp8_, NULL); + _tmp8_ = g_timer_elapsed (_tmp7_, NULL); #line 3285 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = trunc (_tmp9_); -#line 3285 "/home/jens/Source/shotwell/src/Photo.vala" - elapsed = _tmp10_ + 1; -#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = locate; -#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_ != NULL) { -#line 24462 "Photo.c" - PhotoCachedPixbuf* _tmp13_; - Photo* _tmp14_; - Photo* _tmp15_; - gboolean _tmp16_; -#line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = cached_pixbuf; + elapsed = trunc (_tmp8_) + 1; #line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->photo; + if (locate != NULL) { +#line 24819 "Photo.c" + PhotoCachedPixbuf* _tmp10_; + Photo* _tmp11_; #line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = locate; + _tmp10_ = cached_pixbuf; #line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource)); + _tmp11_ = _tmp10_->photo; #line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp16_; -#line 24477 "Photo.c" + _tmp9_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (locate, TYPE_DATA_SOURCE, DataSource)); +#line 24828 "Photo.c" } else { #line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = FALSE; -#line 24481 "Photo.c" + _tmp9_ = FALSE; +#line 24832 "Photo.c" } #line 3287 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 24485 "Photo.c" - GeeIterator* _tmp17_; - PhotoCachedPixbuf* _tmp18_; - PhotoCachedPixbuf* _tmp19_; - gint _tmp20_; + if (_tmp9_) { +#line 24836 "Photo.c" + GeeIterator* _tmp12_; + PhotoCachedPixbuf* _tmp13_; + PhotoCachedPixbuf* _tmp14_; + gint _tmp15_; #line 3289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = iter; + _tmp12_ = iter; #line 3289 "/home/jens/Source/shotwell/src/Photo.vala" - gee_iterator_remove (_tmp17_); + gee_iterator_remove (_tmp12_); #line 3290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = cached_pixbuf; + _tmp13_ = cached_pixbuf; #line 3290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _photo_cached_pixbuf_ref0 (_tmp18_); + _tmp14_ = _photo_cached_pixbuf_ref0 (_tmp13_); #line 3290 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); #line 3290 "/home/jens/Source/shotwell/src/Photo.vala" - found = _tmp19_; + found = _tmp14_; #line 3293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = count; + _tmp15_ = count; #line 3293 "/home/jens/Source/shotwell/src/Photo.vala" - count = _tmp20_ + 1; -#line 24506 "Photo.c" + count = _tmp15_ + 1; +#line 24857 "Photo.c" } else { - gdouble _tmp21_; + gdouble _tmp16_; #line 3294 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = elapsed; + _tmp16_ = elapsed; #line 3294 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_ >= ((gdouble) PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC)) { -#line 24513 "Photo.c" - GeeIterator* _tmp22_; + if (_tmp16_ >= ((gdouble) PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC)) { +#line 24864 "Photo.c" + GeeIterator* _tmp17_; #line 3295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = iter; + _tmp17_ = iter; #line 3295 "/home/jens/Source/shotwell/src/Photo.vala" - gee_iterator_remove (_tmp22_); -#line 24519 "Photo.c" + gee_iterator_remove (_tmp17_); +#line 24870 "Photo.c" } else { - gint _tmp23_; + gint _tmp18_; #line 3296 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = count; + _tmp18_ = count; #line 3296 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp23_ >= PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT) { -#line 24526 "Photo.c" - GeeIterator* _tmp24_; + if (_tmp18_ >= PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT) { +#line 24877 "Photo.c" + GeeIterator* _tmp19_; #line 3297 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = iter; + _tmp19_ = iter; #line 3297 "/home/jens/Source/shotwell/src/Photo.vala" - gee_iterator_remove (_tmp24_); -#line 24532 "Photo.c" + gee_iterator_remove (_tmp19_); +#line 24883 "Photo.c" } else { - gdouble _tmp25_; - gdouble _tmp26_; - gdouble _tmp27_; - gint _tmp28_; + gdouble _tmp20_; + gdouble _tmp21_; + gint _tmp22_; #line 3301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = elapsed; + _tmp20_ = elapsed; #line 3301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = min_elapsed; + _tmp21_ = min_elapsed; #line 3301 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = MIN (_tmp25_, _tmp26_); -#line 3301 "/home/jens/Source/shotwell/src/Photo.vala" - min_elapsed = _tmp27_; + min_elapsed = MIN (_tmp20_, _tmp21_); #line 3302 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = count; + _tmp22_ = count; #line 3302 "/home/jens/Source/shotwell/src/Photo.vala" - count = _tmp28_ + 1; -#line 24550 "Photo.c" + count = _tmp22_ + 1; +#line 24898 "Photo.c" } } } #line 3282 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (cached_pixbuf); -#line 24556 "Photo.c" +#line 24904 "Photo.c" } #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = found; -#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp31_ == NULL) { -#line 24562 "Photo.c" - Photo* _tmp32_; + _tmp25_ = found; #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = locate; + if (_tmp25_ == NULL) { #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp32_ != NULL; -#line 24568 "Photo.c" + _tmp24_ = locate != NULL; +#line 24912 "Photo.c" } else { #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = FALSE; -#line 24572 "Photo.c" + _tmp24_ = FALSE; +#line 24916 "Photo.c" } #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp30_) { -#line 24576 "Photo.c" - gboolean _tmp33_; -#line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = keep; + if (_tmp24_) { #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp33_; -#line 24582 "Photo.c" + _tmp23_ = keep; +#line 24922 "Photo.c" } else { #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = FALSE; -#line 24586 "Photo.c" + _tmp23_ = FALSE; +#line 24926 "Photo.c" } #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp29_) { -#line 24590 "Photo.c" - GdkPixbuf* _tmp34_ = NULL; - Photo* _tmp35_; - Scaling _tmp36_ = {0}; - GdkPixbuf* _tmp37_; - Photo* _tmp38_; - PhotoCachedPixbuf* _tmp39_; -#line 3309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = locate; + if (_tmp23_) { +#line 24930 "Photo.c" + GdkPixbuf* _tmp26_ = NULL; + Scaling _tmp27_ = {0}; + GdkPixbuf* _tmp28_; + PhotoCachedPixbuf* _tmp29_; #line 3309 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_for_original (&_tmp36_); + scaling_for_original (&_tmp27_); #line 3309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = photo_load_raw_pixbuf (_tmp35_, &_tmp36_, PHOTO_EXCEPTION_ALL, BACKING_FETCH_MODE_SOURCE, &_inner_error_); + _tmp28_ = photo_load_raw_pixbuf (locate, &_tmp27_, PHOTO_EXCEPTION_ALL, BACKING_FETCH_MODE_SOURCE, &_inner_error_); #line 3309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp37_; + _tmp26_ = _tmp28_; #line 3309 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3309 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (iter); #line 3309 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 24611 "Photo.c" +#line 24947 "Photo.c" goto __finally394; } #line 3308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = locate; -#line 3308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = photo_cached_pixbuf_new (_tmp38_, _tmp34_); + _tmp29_ = photo_cached_pixbuf_new (locate, _tmp26_); #line 3308 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); #line 3308 "/home/jens/Source/shotwell/src/Photo.vala" - found = _tmp39_; + found = _tmp29_; #line 3307 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp34_); -#line 24624 "Photo.c" + _g_object_unref0 (_tmp26_); +#line 24958 "Photo.c" } else { - PhotoCachedPixbuf* _tmp40_; + PhotoCachedPixbuf* _tmp30_; #line 3310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = found; + _tmp30_ = found; #line 3310 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp40_ != NULL) { -#line 24631 "Photo.c" - PhotoCachedPixbuf* _tmp41_; - GTimer* _tmp42_; + if (_tmp30_ != NULL) { +#line 24965 "Photo.c" + PhotoCachedPixbuf* _tmp31_; + GTimer* _tmp32_; #line 3312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = found; + _tmp31_ = found; #line 3312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_->last_touched; + _tmp32_ = _tmp31_->last_touched; #line 3312 "/home/jens/Source/shotwell/src/Photo.vala" - g_timer_start (_tmp42_); -#line 24640 "Photo.c" + g_timer_start (_tmp32_); +#line 24974 "Photo.c" } } #line 3316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = found; -#line 3316 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_ != NULL) { -#line 24647 "Photo.c" - gboolean _tmp45_; + _tmp34_ = found; #line 3316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = keep; + if (_tmp34_ != NULL) { #line 3316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp45_; -#line 24653 "Photo.c" + _tmp33_ = keep; +#line 24983 "Photo.c" } else { #line 3316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = FALSE; -#line 24657 "Photo.c" + _tmp33_ = FALSE; +#line 24987 "Photo.c" } #line 3316 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp43_) { -#line 24661 "Photo.c" - GeeLinkedList* _tmp46_; - PhotoCachedPixbuf* _tmp47_; - PhotoCachedPixbuf* _tmp48_; - GTimer* _tmp49_; - gdouble _tmp50_; - gdouble _tmp51_; - gdouble _tmp52_; + if (_tmp33_) { +#line 24991 "Photo.c" + GeeLinkedList* _tmp35_; + PhotoCachedPixbuf* _tmp36_; + PhotoCachedPixbuf* _tmp37_; + GTimer* _tmp38_; + gdouble _tmp39_; + gdouble _tmp40_; #line 3317 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = photo_source_pixbuf_cache; + _tmp35_ = photo_source_pixbuf_cache; #line 3317 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = found; + _tmp36_ = found; #line 3317 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp47_); -#line 3322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = found; + gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp36_); #line 3322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_->last_touched; + _tmp37_ = found; #line 3322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = g_timer_elapsed (_tmp49_, NULL); + _tmp38_ = _tmp37_->last_touched; #line 3322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = min_elapsed; + _tmp39_ = g_timer_elapsed (_tmp38_, NULL); #line 3322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = MIN (_tmp50_, _tmp51_); + _tmp40_ = min_elapsed; #line 3322 "/home/jens/Source/shotwell/src/Photo.vala" - min_elapsed = _tmp52_; + min_elapsed = MIN (_tmp39_, _tmp40_); #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 24689 "Photo.c" - GeeLinkedList* _tmp53_; - gint _tmp54_; - gint _tmp55_; - GeeLinkedList* _tmp56_; - gpointer _tmp57_; - PhotoCachedPixbuf* _tmp58_; +#line 25016 "Photo.c" + GeeLinkedList* _tmp41_; + gint _tmp42_; + gint _tmp43_; + GeeLinkedList* _tmp44_; + gpointer _tmp45_; + PhotoCachedPixbuf* _tmp46_; #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = photo_source_pixbuf_cache; + _tmp41_ = photo_source_pixbuf_cache; #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp42_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = _tmp54_; + _tmp43_ = _tmp42_; #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp55_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) { + if (!(_tmp43_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) { #line 3326 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 24706 "Photo.c" +#line 25033 "Photo.c" } #line 3327 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = photo_source_pixbuf_cache; + _tmp44_ = photo_source_pixbuf_cache; #line 3327 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_DEQUE, GeeDeque)); + _tmp45_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_DEQUE, GeeDeque)); #line 3327 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = (PhotoCachedPixbuf*) _tmp57_; + _tmp46_ = (PhotoCachedPixbuf*) _tmp45_; #line 3327 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_cached_pixbuf_unref0 (_tmp58_); -#line 24716 "Photo.c" + _photo_cached_pixbuf_unref0 (_tmp46_); +#line 25043 "Photo.c" } } #line 3331 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = photo_discard_source_id; + _tmp47_ = photo_discard_source_id; #line 3331 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp59_ != ((guint) 0)) { -#line 24723 "Photo.c" - guint _tmp60_; + if (_tmp47_ != ((guint) 0)) { +#line 25050 "Photo.c" + guint _tmp48_; #line 3332 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = photo_discard_source_id; + _tmp48_ = photo_discard_source_id; #line 3332 "/home/jens/Source/shotwell/src/Photo.vala" - g_source_remove (_tmp60_); + g_source_remove (_tmp48_); #line 3333 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_source_id = (guint) 0; -#line 24731 "Photo.c" +#line 25058 "Photo.c" } #line 3337 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = photo_source_pixbuf_cache; + _tmp49_ = photo_source_pixbuf_cache; #line 3337 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp50_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 3337 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = _tmp62_; + _tmp51_ = _tmp50_; #line 3337 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp63_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) { -#line 24741 "Photo.c" - gdouble _tmp64_; + if (_tmp51_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) { +#line 25068 "Photo.c" + gdouble _tmp52_; guint retry_sec = 0U; - gdouble _tmp65_; - gdouble _tmp66_; - guint _tmp67_; - guint _tmp68_; + gdouble _tmp53_; + guint _tmp54_; #line 3338 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = min_elapsed; + _tmp52_ = min_elapsed; #line 3338 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp64_ >= 0.0, "min_elapsed >= 0.0"); -#line 3341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = min_elapsed; + _vala_assert (_tmp52_ >= 0.0, "min_elapsed >= 0.0"); #line 3341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = trunc (_tmp65_); + _tmp53_ = min_elapsed; #line 3341 "/home/jens/Source/shotwell/src/Photo.vala" - retry_sec = PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC - ((guint) _tmp66_); -#line 3342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = retry_sec; + retry_sec = PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC - ((guint) trunc (_tmp53_)); #line 3342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = g_timeout_add_seconds_full (G_PRIORITY_LOW, _tmp67_, _photo_trim_source_pixbuf_cache_gsource_func, NULL, NULL); + _tmp54_ = retry_sec; #line 3342 "/home/jens/Source/shotwell/src/Photo.vala" - photo_discard_source_id = _tmp68_; -#line 24764 "Photo.c" + photo_discard_source_id = g_timeout_add_seconds_full (G_PRIORITY_LOW, _tmp54_, _photo_trim_source_pixbuf_cache_gsource_func, NULL, NULL); +#line 25085 "Photo.c" } #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = found; + _tmp56_ = found; #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp70_ != NULL) { -#line 24770 "Photo.c" - PhotoCachedPixbuf* _tmp71_; - GdkPixbuf* _tmp72_; + if (_tmp56_ != NULL) { +#line 25091 "Photo.c" + PhotoCachedPixbuf* _tmp57_; + GdkPixbuf* _tmp58_; #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = found; + _tmp57_ = found; #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_->pixbuf; + _tmp58_ = _tmp57_->pixbuf; #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = _tmp72_; -#line 24779 "Photo.c" + _tmp55_ = _tmp58_; +#line 25100 "Photo.c" } else { #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = NULL; -#line 24783 "Photo.c" + _tmp55_ = NULL; +#line 25104 "Photo.c" } #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = _g_object_ref0 (_tmp69_); + _tmp59_ = _g_object_ref0 (_tmp55_); #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp73_; + result = _tmp59_; #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (iter); #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" _photo_cached_pixbuf_unref0 (found); -#line 24793 "Photo.c" +#line 25114 "Photo.c" { - GeeLinkedList* _tmp74_; + GeeLinkedList* _tmp60_; #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = photo_source_pixbuf_cache; + _tmp60_ = photo_source_pixbuf_cache; #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache); -#line 24800 "Photo.c" +#line 25121 "Photo.c" } #line 3345 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24804 "Photo.c" +#line 25125 "Photo.c" } __finally394: { - GeeLinkedList* _tmp75_; + GeeLinkedList* _tmp61_; #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = photo_source_pixbuf_cache; + _tmp61_ = photo_source_pixbuf_cache; #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache); -#line 24813 "Photo.c" +#line 25134 "Photo.c" } #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3274 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24819 "Photo.c" +#line 25140 "Photo.c" } } -static gboolean photo_trim_source_pixbuf_cache (void) { +static gboolean +photo_trim_source_pixbuf_cache (void) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; { @@ -24836,7 +25159,7 @@ static gboolean photo_trim_source_pixbuf_cache (void) { _g_object_unref0 (_tmp1_); #line 3351 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 24838 "Photo.c" +#line 25161 "Photo.c" goto __catch395_g_error; } } @@ -24850,12 +25173,12 @@ static gboolean photo_trim_source_pixbuf_cache (void) { _inner_error_ = NULL; #line 3350 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 24852 "Photo.c" +#line 25175 "Photo.c" } __finally395: #line 3350 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 24857 "Photo.c" +#line 25180 "Photo.c" gboolean _tmp2_ = FALSE; #line 3350 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -24863,13 +25186,13 @@ static gboolean photo_trim_source_pixbuf_cache (void) { g_clear_error (&_inner_error_); #line 3350 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp2_; -#line 24865 "Photo.c" +#line 25188 "Photo.c" } #line 3355 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3355 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24871 "Photo.c" +#line 25194 "Photo.c" } @@ -24878,7 +25201,10 @@ static gboolean photo_trim_source_pixbuf_cache (void) { * * @return A copy of the Pixbuf with the image data from unmodified_precached. */ -GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) { +GdkPixbuf* +photo_get_prefetched_copy (Photo* self, + GError** error) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; GdkPixbuf* _tmp1_; @@ -24896,7 +25222,7 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 3364 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 24898 "Photo.c" +#line 25224 "Photo.c" } #line 3364 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = gdk_pixbuf_copy (_tmp0_); @@ -24906,18 +25232,20 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) { _g_object_unref0 (_tmp0_); #line 3364 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 24908 "Photo.c" +#line 25234 "Photo.c" } /** * @brief Discards the cached version of the unmodified image. */ -void photo_discard_prefetched (Photo* self) { +void +photo_discard_prefetched (Photo* self) +{ GError * _inner_error_ = NULL; #line 3370 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); -#line 24919 "Photo.c" +#line 25247 "Photo.c" { GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; @@ -24929,7 +25257,7 @@ void photo_discard_prefetched (Photo* self) { _g_object_unref0 (_tmp1_); #line 3372 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 24931 "Photo.c" +#line 25259 "Photo.c" goto __catch396_g_error; } } @@ -24943,7 +25271,7 @@ void photo_discard_prefetched (Photo* self) { _inner_error_ = NULL; #line 3371 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 24945 "Photo.c" +#line 25273 "Photo.c" } __finally396: #line 3371 "/home/jens/Source/shotwell/src/Photo.vala" @@ -24954,7 +25282,7 @@ void photo_discard_prefetched (Photo* self) { g_clear_error (&_inner_error_); #line 3371 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 24956 "Photo.c" +#line 25284 "Photo.c" } } @@ -24970,7 +25298,13 @@ void photo_discard_prefetched (Photo* self) { * @param fetch_mode The fetch mode; if left unset, defaults to BASELINE so that * we get the image exactly as it is in the file. */ -GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error) { +GdkPixbuf* +photo_get_pixbuf_with_options (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error) +{ GdkPixbuf* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -24991,20 +25325,10 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx PixelTransformer* transformer = NULL; Orientation orientation = 0; GdkPixbuf* pixbuf = NULL; - GdkPixbuf* _tmp33_; - PhotoException _tmp34_; - gboolean _tmp35_; - PhotoException _tmp40_; - gboolean _tmp41_; - PhotoException _tmp46_; - gboolean _tmp47_; - PhotoException _tmp85_; - gboolean _tmp86_; - gboolean _tmp89_; - PhotoException _tmp96_; - gboolean _tmp97_; - gboolean _tmp101_ = FALSE; - gboolean _tmp102_; + GdkPixbuf* _tmp22_; + gboolean _tmp64_; + gboolean _tmp74_ = FALSE; + gboolean _tmp75_; GError * _inner_error_ = NULL; #line 3388 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); @@ -25016,86 +25340,62 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _tmp4_ = _tmp3_; #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp4_) { -#line 25018 "Photo.c" - PhotoFileFormat _tmp5_; -#line 3402 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_get_master_file_format (self); #line 3402 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _tmp5_ == PHOTO_FILE_FORMAT_RAW; -#line 25024 "Photo.c" + _tmp2_ = photo_get_master_file_format (self) == PHOTO_FILE_FORMAT_RAW; +#line 25344 "Photo.c" } else { #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = FALSE; -#line 25028 "Photo.c" +#line 25348 "Photo.c" } #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { -#line 25032 "Photo.c" +#line 25352 "Photo.c" + gboolean _tmp5_ = FALSE; gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - BackingFetchMode _tmp8_; -#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = fetch_mode; #line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_ == BACKING_FETCH_MODE_BASELINE) { + if (fetch_mode == BACKING_FETCH_MODE_BASELINE) { #line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = TRUE; -#line 25042 "Photo.c" + _tmp6_ = TRUE; +#line 25359 "Photo.c" } else { - BackingFetchMode _tmp9_; -#line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = fetch_mode; #line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp9_ == BACKING_FETCH_MODE_UNMODIFIED; -#line 25049 "Photo.c" + _tmp6_ = fetch_mode == BACKING_FETCH_MODE_UNMODIFIED; +#line 25363 "Photo.c" } #line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_) { + if (_tmp6_) { #line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = TRUE; -#line 25055 "Photo.c" + _tmp5_ = TRUE; +#line 25369 "Photo.c" } else { - BackingFetchMode _tmp10_; #line 3404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = fetch_mode; -#line 3404 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp10_ == BACKING_FETCH_MODE_SOURCE; -#line 25062 "Photo.c" + _tmp5_ = fetch_mode == BACKING_FETCH_MODE_SOURCE; +#line 25373 "Photo.c" } #line 3403 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp6_; -#line 25066 "Photo.c" + _tmp1_ = _tmp5_; +#line 25377 "Photo.c" } else { #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 25070 "Photo.c" +#line 25381 "Photo.c" } #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 25074 "Photo.c" - RawDeveloper _tmp11_; - gboolean _tmp12_; #line 3405 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_get_raw_developer (self); -#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_is_raw_developer_complete (self, _tmp11_); -#line 3405 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = !_tmp12_; -#line 25083 "Photo.c" + _tmp0_ = !photo_is_raw_developer_complete (self, photo_get_raw_developer (self)); +#line 25387 "Photo.c" } else { #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 25087 "Photo.c" +#line 25391 "Photo.c" } #line 3401 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 25091 "Photo.c" - RawDeveloper _tmp13_; #line 3406 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_get_raw_developer (self); -#line 3406 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_raw_developer (self, _tmp13_, TRUE); -#line 25097 "Photo.c" + photo_set_raw_developer (self, photo_get_raw_developer (self), TRUE); +#line 25397 "Photo.c" } #line 3411 "/home/jens/Source/shotwell/src/Photo.vala" dimensions_init (&original, 0, 0); @@ -25109,105 +25409,93 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx _redeye_instances_size_ = redeye_instances_length1; #line 3416 "/home/jens/Source/shotwell/src/Photo.vala" transformer = NULL; -#line 25111 "Photo.c" +#line 25411 "Photo.c" { - PhotoRow* _tmp14_; + PhotoRow* _tmp7_; #line 3419 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->row; + _tmp7_ = self->row; #line 3419 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 25118 "Photo.c" - { - Dimensions _tmp15_ = {0}; - PhotoException _tmp16_; - Dimensions _tmp17_ = {0}; - Dimensions _tmp18_ = {0}; - Dimensions _tmp19_; - Dimensions _tmp20_ = {0}; - Dimensions _tmp21_; - gboolean _tmp22_; - gint _tmp23_; - EditingToolsRedeyeInstance* _tmp24_; - Box _tmp25_ = {0}; - gboolean _tmp26_; - gdouble _tmp27_ = 0.0; - gboolean _tmp28_; - gboolean _tmp29_; - Orientation _tmp31_; +#line 25418 "Photo.c" + { + Dimensions _tmp8_ = {0}; + Dimensions _tmp9_ = {0}; + Dimensions _tmp10_ = {0}; + Dimensions _tmp11_; + Dimensions _tmp12_ = {0}; + Dimensions _tmp13_; + gint _tmp14_; + EditingToolsRedeyeInstance* _tmp15_; + Box _tmp16_ = {0}; + gboolean _tmp17_; + gdouble _tmp18_ = 0.0; + gboolean _tmp19_; #line 3420 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ALL, &_tmp15_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ALL, &_tmp8_); #line 3420 "/home/jens/Source/shotwell/src/Photo.vala" - original = _tmp15_; + original = _tmp8_; #line 3421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = exceptions; + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), exceptions, &_tmp9_); #line 3421 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp16_, &_tmp17_); + scaling_get_scaled_dimensions (scaling, &_tmp9_, &_tmp10_); #line 3421 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_get_scaled_dimensions (scaling, &_tmp17_, &_tmp18_); -#line 3421 "/home/jens/Source/shotwell/src/Photo.vala" - scaled = _tmp18_; + scaled = _tmp10_; #line 3422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = scaled; + _tmp11_ = scaled; #line 3422 "/home/jens/Source/shotwell/src/Photo.vala" - scaled_to_viewport = _tmp19_; -#line 3424 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp20_); + scaled_to_viewport = _tmp11_; #line 3424 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = scaled; + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp12_); #line 3424 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = dimensions_equals (&_tmp20_, &_tmp21_); + _tmp13_ = scaled; #line 3424 "/home/jens/Source/shotwell/src/Photo.vala" - is_scaled = !_tmp22_; + is_scaled = !dimensions_equals (&_tmp12_, &_tmp13_); #line 3426 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = photo_get_raw_redeye_instances (self, &_tmp23_); + _tmp15_ = photo_get_raw_redeye_instances (self, &_tmp14_); #line 3426 "/home/jens/Source/shotwell/src/Photo.vala" redeye_instances = (g_free (redeye_instances), NULL); #line 3426 "/home/jens/Source/shotwell/src/Photo.vala" - redeye_instances = _tmp24_; + redeye_instances = _tmp15_; #line 3426 "/home/jens/Source/shotwell/src/Photo.vala" - redeye_instances_length1 = _tmp23_; + redeye_instances_length1 = _tmp14_; #line 3426 "/home/jens/Source/shotwell/src/Photo.vala" _redeye_instances_size_ = redeye_instances_length1; #line 3428 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_get_raw_crop (self, &_tmp25_); + _tmp17_ = photo_get_raw_crop (self, &_tmp16_); #line 3428 "/home/jens/Source/shotwell/src/Photo.vala" - crop = _tmp25_; + crop = _tmp16_; #line 3428 "/home/jens/Source/shotwell/src/Photo.vala" - is_cropped = _tmp26_; + is_cropped = _tmp17_; #line 3430 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = photo_get_raw_straighten (self, &_tmp27_); + _tmp19_ = photo_get_raw_straighten (self, &_tmp18_); #line 3430 "/home/jens/Source/shotwell/src/Photo.vala" - straightening_angle = _tmp27_; + straightening_angle = _tmp18_; #line 3430 "/home/jens/Source/shotwell/src/Photo.vala" - is_straightened = _tmp28_; + is_straightened = _tmp19_; #line 3432 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = photo_has_color_adjustments (self); -#line 3432 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp29_) { -#line 25186 "Photo.c" - PixelTransformer* _tmp30_; + if (photo_has_color_adjustments (self)) { +#line 25476 "Photo.c" + PixelTransformer* _tmp20_; #line 3433 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = photo_get_pixel_transformer (self); + _tmp20_ = photo_get_pixel_transformer (self); #line 3433 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (transformer); #line 3433 "/home/jens/Source/shotwell/src/Photo.vala" - transformer = _tmp30_; -#line 25194 "Photo.c" + transformer = _tmp20_; +#line 25484 "Photo.c" } #line 3435 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = photo_get_orientation (self); -#line 3435 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp31_; -#line 25200 "Photo.c" + orientation = photo_get_orientation (self); +#line 25488 "Photo.c" } __finally397: { - PhotoRow* _tmp32_; + PhotoRow* _tmp21_; #line 3419 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->row; + _tmp21_ = self->row; #line 3419 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 25209 "Photo.c" +#line 25497 "Photo.c" } #line 3419 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -25219,13 +25507,13 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx redeye_instances = (g_free (redeye_instances), NULL); #line 3419 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 25221 "Photo.c" +#line 25509 "Photo.c" } } #line 3442 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = photo_get_prefetched_copy (self, &_inner_error_); + _tmp22_ = photo_get_prefetched_copy (self, &_inner_error_); #line 3442 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp33_; + pixbuf = _tmp22_; #line 3442 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3442 "/home/jens/Source/shotwell/src/Photo.vala" @@ -25236,325 +25524,284 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx redeye_instances = (g_free (redeye_instances), NULL); #line 3442 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 25238 "Photo.c" +#line 25526 "Photo.c" } #line 3449 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = exceptions; -#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo_exception_allows (_tmp34_, PHOTO_EXCEPTION_REDEYE); -#line 3449 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp35_) { -#line 25246 "Photo.c" - EditingToolsRedeyeInstance* _tmp36_; - gint _tmp36__length1; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_REDEYE)) { +#line 25530 "Photo.c" + EditingToolsRedeyeInstance* _tmp23_; + gint _tmp23__length1; #line 3454 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = redeye_instances; + _tmp23_ = redeye_instances; #line 3454 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36__length1 = redeye_instances_length1; -#line 25253 "Photo.c" + _tmp23__length1 = redeye_instances_length1; +#line 25537 "Photo.c" { EditingToolsRedeyeInstance* instance_collection = NULL; gint instance_collection_length1 = 0; gint _instance_collection_size_ = 0; gint instance_it = 0; #line 3454 "/home/jens/Source/shotwell/src/Photo.vala" - instance_collection = _tmp36_; + instance_collection = _tmp23_; #line 3454 "/home/jens/Source/shotwell/src/Photo.vala" - instance_collection_length1 = _tmp36__length1; + instance_collection_length1 = _tmp23__length1; #line 3454 "/home/jens/Source/shotwell/src/Photo.vala" - for (instance_it = 0; instance_it < _tmp36__length1; instance_it = instance_it + 1) { -#line 25265 "Photo.c" + for (instance_it = 0; instance_it < _tmp23__length1; instance_it = instance_it + 1) { +#line 25549 "Photo.c" EditingToolsRedeyeInstance instance = {0}; #line 3454 "/home/jens/Source/shotwell/src/Photo.vala" instance = instance_collection[instance_it]; -#line 25269 "Photo.c" +#line 25553 "Photo.c" { - GdkPixbuf* _tmp37_; - EditingToolsRedeyeInstance _tmp38_; - GdkPixbuf* _tmp39_; + GdkPixbuf* _tmp24_; + EditingToolsRedeyeInstance _tmp25_; + GdkPixbuf* _tmp26_; #line 3455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = pixbuf; + _tmp24_ = pixbuf; #line 3455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = instance; + _tmp25_ = instance; #line 3455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = photo_do_redeye (self, _tmp37_, &_tmp38_); + _tmp26_ = photo_do_redeye (self, _tmp24_, &_tmp25_); #line 3455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3455 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp39_; -#line 25284 "Photo.c" + pixbuf = _tmp26_; +#line 25568 "Photo.c" } } } } #line 3463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = exceptions; -#line 3463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_STRAIGHTEN); -#line 3463 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp41_) { -#line 25295 "Photo.c" - gboolean _tmp42_; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_STRAIGHTEN)) { +#line 25575 "Photo.c" + gboolean _tmp27_; #line 3467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = is_straightened; + _tmp27_ = is_straightened; #line 3467 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp42_) { -#line 25301 "Photo.c" - GdkPixbuf* _tmp43_; - gdouble _tmp44_; - GdkPixbuf* _tmp45_; + if (_tmp27_) { +#line 25581 "Photo.c" + GdkPixbuf* _tmp28_; + gdouble _tmp29_; + GdkPixbuf* _tmp30_; #line 3468 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = pixbuf; + _tmp28_ = pixbuf; #line 3468 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = straightening_angle; + _tmp29_ = straightening_angle; #line 3468 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = rotate_arb (_tmp43_, _tmp44_); + _tmp30_ = rotate_arb (_tmp28_, _tmp29_); #line 3468 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3468 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp45_; -#line 25315 "Photo.c" + pixbuf = _tmp30_; +#line 25595 "Photo.c" } } #line 3477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = exceptions; -#line 3477 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = photo_exception_allows (_tmp46_, PHOTO_EXCEPTION_CROP); -#line 3477 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp47_) { -#line 25324 "Photo.c" - gboolean _tmp48_; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_CROP)) { +#line 25600 "Photo.c" + gboolean _tmp31_; #line 3481 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = is_cropped; + _tmp31_ = is_cropped; #line 3481 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp48_) { -#line 25330 "Photo.c" + if (_tmp31_) { +#line 25606 "Photo.c" + Box _tmp32_; + gint _tmp33_; + GdkPixbuf* _tmp34_; + gint _tmp35_; + gint _tmp36_; + Box _tmp37_; + gint _tmp38_; + GdkPixbuf* _tmp39_; + gint _tmp40_; + gint _tmp41_; + Box _tmp42_; + gint _tmp43_; + Box _tmp44_; + gint _tmp45_; + GdkPixbuf* _tmp46_; + gint _tmp47_; + gint _tmp48_; Box _tmp49_; gint _tmp50_; - GdkPixbuf* _tmp51_; + Box _tmp51_; gint _tmp52_; - gint _tmp53_; + GdkPixbuf* _tmp53_; gint _tmp54_; - Box _tmp55_; - gint _tmp56_; - GdkPixbuf* _tmp57_; + gint _tmp55_; + GdkPixbuf* _tmp56_; + Box _tmp57_; gint _tmp58_; - gint _tmp59_; + Box _tmp59_; gint _tmp60_; - Box _tmp61_; - gint _tmp62_; - Box _tmp63_; - gint _tmp64_; - GdkPixbuf* _tmp65_; - gint _tmp66_; - gint _tmp67_; - gint _tmp68_; - Box _tmp69_; - gint _tmp70_; - Box _tmp71_; - gint _tmp72_; - GdkPixbuf* _tmp73_; - gint _tmp74_; - gint _tmp75_; - gint _tmp76_; - GdkPixbuf* _tmp77_; - Box _tmp78_; - gint _tmp79_; - Box _tmp80_; - gint _tmp81_; - gint _tmp82_; - gint _tmp83_; - GdkPixbuf* _tmp84_; + GdkPixbuf* _tmp61_; #line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = crop; -#line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = _tmp49_.left; + _tmp32_ = crop; #line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = pixbuf; + _tmp33_ = _tmp32_.left; #line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = gdk_pixbuf_get_width (_tmp51_); + _tmp34_ = pixbuf; #line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp52_; + _tmp35_ = gdk_pixbuf_get_width (_tmp34_); #line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = CLAMP (_tmp50_, 0, _tmp53_ - 2); + _tmp36_ = _tmp35_; #line 3486 "/home/jens/Source/shotwell/src/Photo.vala" - crop.left = _tmp54_; -#line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = crop; + crop.left = CLAMP (_tmp33_, 0, _tmp36_ - 2); #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = _tmp55_.top; + _tmp37_ = crop; #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = pixbuf; + _tmp38_ = _tmp37_.top; #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = gdk_pixbuf_get_height (_tmp57_); + _tmp39_ = pixbuf; #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = _tmp58_; + _tmp40_ = gdk_pixbuf_get_height (_tmp39_); #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = CLAMP (_tmp56_, 0, _tmp59_ - 2); + _tmp41_ = _tmp40_; #line 3487 "/home/jens/Source/shotwell/src/Photo.vala" - crop.top = _tmp60_; + crop.top = CLAMP (_tmp38_, 0, _tmp41_ - 2); #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = crop; + _tmp42_ = crop; #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = _tmp61_.right; + _tmp43_ = _tmp42_.right; #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = crop; + _tmp44_ = crop; #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = _tmp63_.left; + _tmp45_ = _tmp44_.left; #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = pixbuf; + _tmp46_ = pixbuf; #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = gdk_pixbuf_get_width (_tmp65_); + _tmp47_ = gdk_pixbuf_get_width (_tmp46_); #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = _tmp66_; + _tmp48_ = _tmp47_; #line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = CLAMP (_tmp62_, _tmp64_ + 1, _tmp67_ - 1); -#line 3489 "/home/jens/Source/shotwell/src/Photo.vala" - crop.right = _tmp68_; -#line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = crop; + crop.right = CLAMP (_tmp43_, _tmp45_ + 1, _tmp48_ - 1); #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = _tmp69_.bottom; + _tmp49_ = crop; #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = crop; + _tmp50_ = _tmp49_.bottom; #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_.top; + _tmp51_ = crop; #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = pixbuf; + _tmp52_ = _tmp51_.top; #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = gdk_pixbuf_get_height (_tmp73_); + _tmp53_ = pixbuf; #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = _tmp74_; + _tmp54_ = gdk_pixbuf_get_height (_tmp53_); #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = CLAMP (_tmp70_, _tmp72_ + 1, _tmp75_ - 1); + _tmp55_ = _tmp54_; #line 3490 "/home/jens/Source/shotwell/src/Photo.vala" - crop.bottom = _tmp76_; -#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = pixbuf; + crop.bottom = CLAMP (_tmp50_, _tmp52_ + 1, _tmp55_ - 1); #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = crop; + _tmp56_ = pixbuf; #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = _tmp78_.left; + _tmp57_ = crop; #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = crop; + _tmp58_ = _tmp57_.left; #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = _tmp80_.top; + _tmp59_ = crop; #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = box_get_width (&crop); + _tmp60_ = _tmp59_.top; #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = box_get_height (&crop); -#line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = gdk_pixbuf_new_subpixbuf (_tmp77_, _tmp79_, _tmp81_, _tmp82_, _tmp83_); + _tmp61_ = gdk_pixbuf_new_subpixbuf (_tmp56_, _tmp58_, _tmp60_, box_get_width (&crop), box_get_height (&crop)); #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3492 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp84_; -#line 25451 "Photo.c" + pixbuf = _tmp61_; +#line 25709 "Photo.c" } } #line 3502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = exceptions; -#line 3502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = photo_exception_allows (_tmp85_, PHOTO_EXCEPTION_ORIENTATION); -#line 3502 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp86_) { -#line 25460 "Photo.c" - GdkPixbuf* _tmp87_; - GdkPixbuf* _tmp88_; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ORIENTATION)) { +#line 25714 "Photo.c" + GdkPixbuf* _tmp62_; + GdkPixbuf* _tmp63_; #line 3506 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = pixbuf; + _tmp62_ = pixbuf; #line 3506 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = orientation_rotate_pixbuf (orientation, _tmp87_); + _tmp63_ = orientation_rotate_pixbuf (orientation, _tmp62_); #line 3506 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3506 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp88_; -#line 25471 "Photo.c" + pixbuf = _tmp63_; +#line 25725 "Photo.c" } #line 3513 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = is_scaled; + _tmp64_ = is_scaled; #line 3513 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp89_) { -#line 25477 "Photo.c" - GdkPixbuf* _tmp90_; - Dimensions _tmp91_; - gint _tmp92_; - Dimensions _tmp93_; - gint _tmp94_; - GdkPixbuf* _tmp95_; + if (_tmp64_) { +#line 25731 "Photo.c" + GdkPixbuf* _tmp65_; + Dimensions _tmp66_; + gint _tmp67_; + Dimensions _tmp68_; + gint _tmp69_; + GdkPixbuf* _tmp70_; #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = pixbuf; + _tmp65_ = pixbuf; #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = scaled_to_viewport; + _tmp66_ = scaled_to_viewport; #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = _tmp91_.width; + _tmp67_ = _tmp66_.width; #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = scaled_to_viewport; + _tmp68_ = scaled_to_viewport; #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = _tmp93_.height; + _tmp69_ = _tmp68_.height; #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = gdk_pixbuf_scale_simple (_tmp90_, _tmp92_, _tmp94_, GDK_INTERP_BILINEAR); + _tmp70_ = gdk_pixbuf_scale_simple (_tmp65_, _tmp67_, _tmp69_, GDK_INTERP_BILINEAR); #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3517 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp95_; -#line 25500 "Photo.c" + pixbuf = _tmp70_; +#line 25754 "Photo.c" } #line 3525 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = exceptions; -#line 3525 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = photo_exception_allows (_tmp96_, PHOTO_EXCEPTION_ADJUST); -#line 3525 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp97_) { -#line 25508 "Photo.c" - PixelTransformer* _tmp98_; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ADJUST)) { +#line 25758 "Photo.c" + PixelTransformer* _tmp71_; #line 3529 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = transformer; + _tmp71_ = transformer; #line 3529 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp98_ != NULL) { -#line 25514 "Photo.c" - PixelTransformer* _tmp99_; - GdkPixbuf* _tmp100_; + if (_tmp71_ != NULL) { +#line 25764 "Photo.c" + PixelTransformer* _tmp72_; + GdkPixbuf* _tmp73_; #line 3530 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = transformer; + _tmp72_ = transformer; #line 3530 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = pixbuf; + _tmp73_ = pixbuf; #line 3530 "/home/jens/Source/shotwell/src/Photo.vala" - pixel_transformer_transform_pixbuf (_tmp99_, _tmp100_, NULL); -#line 25523 "Photo.c" + pixel_transformer_transform_pixbuf (_tmp72_, _tmp73_, NULL); +#line 25773 "Photo.c" } } #line 3539 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = is_scaled; + _tmp75_ = is_scaled; #line 3539 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp102_) { -#line 25530 "Photo.c" - gboolean _tmp103_; + if (_tmp75_) { +#line 25780 "Photo.c" + gboolean _tmp76_; #line 3539 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = is_straightened; + _tmp76_ = is_straightened; #line 3539 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = !_tmp103_; -#line 25536 "Photo.c" + _tmp74_ = !_tmp76_; +#line 25786 "Photo.c" } else { #line 3539 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = FALSE; -#line 25540 "Photo.c" + _tmp74_ = FALSE; +#line 25790 "Photo.c" } #line 3539 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp101_) { -#line 25544 "Photo.c" - GdkPixbuf* _tmp104_; - Dimensions _tmp105_ = {0}; - gboolean _tmp106_; -#line 3540 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = pixbuf; + if (_tmp74_) { +#line 25794 "Photo.c" + GdkPixbuf* _tmp77_; + Dimensions _tmp78_ = {0}; #line 3540 "/home/jens/Source/shotwell/src/Photo.vala" - dimensions_for_pixbuf (_tmp104_, &_tmp105_); + _tmp77_ = pixbuf; #line 3540 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = dimensions_approx_equals (&scaled_to_viewport, &_tmp105_, PHOTO_SCALING_FUDGE); + dimensions_for_pixbuf (_tmp77_, &_tmp78_); #line 3540 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp106_, "scaled_to_viewport.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)"); -#line 25556 "Photo.c" + _vala_assert (dimensions_approx_equals (&scaled_to_viewport, &_tmp78_, PHOTO_SCALING_FUDGE), "scaled_to_viewport.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)"); +#line 25803 "Photo.c" } #line 3548 "/home/jens/Source/shotwell/src/Photo.vala" result = pixbuf; @@ -25564,234 +25811,228 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx redeye_instances = (g_free (redeye_instances), NULL); #line 3548 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25566 "Photo.c" +#line 25813 "Photo.c" } -static gboolean photo_real_has_user_generated_metadata (Photo* self) { +static gboolean +photo_real_has_user_generated_metadata (Photo* self) +{ gboolean _tmp0_ = FALSE; #line 3556 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("Type `%s' does not implement abstract method `photo_has_user_generated_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 3556 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp0_; -#line 25576 "Photo.c" +#line 25825 "Photo.c" } -gboolean photo_has_user_generated_metadata (Photo* self) { +gboolean +photo_has_user_generated_metadata (Photo* self) +{ #line 3556 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 3556 "/home/jens/Source/shotwell/src/Photo.vala" return PHOTO_GET_CLASS (self)->has_user_generated_metadata (self); -#line 25585 "Photo.c" +#line 25836 "Photo.c" } -static void photo_real_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) { +static void +photo_real_set_user_metadata_for_export (Photo* self, + PhotoMetadata* metadata) +{ #line 3560 "/home/jens/Source/shotwell/src/Photo.vala" g_critical ("Type `%s' does not implement abstract method `photo_set_user_metadata_for_export'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 3560 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 25594 "Photo.c" +#line 25848 "Photo.c" } -void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) { +void +photo_set_user_metadata_for_export (Photo* self, + PhotoMetadata* metadata) +{ #line 3560 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 3560 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_GET_CLASS (self)->set_user_metadata_for_export (self, metadata); -#line 25603 "Photo.c" +#line 25860 "Photo.c" } -gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) { +gchar* +photo_get_export_basename (Photo* self, + PhotoFileFormat* file_format) +{ gchar* result = NULL; - PhotoFileFormat* _tmp0_; #line 3567 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 3568 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file_format; -#line 3568 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != NULL) { -#line 25616 "Photo.c" - PhotoFileFormat* _tmp1_; - PhotoFileFormatProperties* _tmp2_; - PhotoFileFormatProperties* _tmp3_; + if (file_format != NULL) { +#line 25873 "Photo.c" + PhotoFileFormatProperties* _tmp0_; + PhotoFileFormatProperties* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; GFile* _tmp4_; GFile* _tmp5_; - GFile* _tmp6_; - GFile* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; + gchar* _tmp6_; + gchar* _tmp7_; #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file_format; + _tmp0_ = photo_file_format_get_properties (*file_format); +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" + _tmp1_ = _tmp0_; #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_file_format_get_properties (*_tmp1_); + _tmp2_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp4_ = photo_file_format_properties_convert_file_extension (_tmp1_, _tmp3_); #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_; #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_format_properties_convert_file_extension (_tmp3_, _tmp5_); + _tmp6_ = g_file_get_basename (_tmp5_); #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = _tmp6_; #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_file_get_basename (_tmp7_); -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp7_); -#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp5_); #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_format_properties_unref0 (_tmp3_); + _g_object_unref0 (_tmp3_); +#line 3569 "/home/jens/Source/shotwell/src/Photo.vala" + _photo_file_format_properties_unref0 (_tmp1_); #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp9_; + result = _tmp7_; #line 3569 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25654 "Photo.c" +#line 25908 "Photo.c" } else { - PhotoFileFormat _tmp10_; - gboolean _tmp11_; -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_get_file_format (self); -#line 3571 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo_file_format_can_write (_tmp10_); #line 3571 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 25664 "Photo.c" - PhotoFileFormat _tmp12_; - PhotoFileFormatProperties* _tmp13_; - PhotoFileFormatProperties* _tmp14_; - GFile* _tmp15_; - GFile* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; -#line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_get_file_format (self); + if (photo_file_format_can_write (photo_get_file_format (self))) { +#line 25912 "Photo.c" + PhotoFileFormatProperties* _tmp8_; + PhotoFileFormatProperties* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_file_format_get_properties (_tmp12_); + _tmp8_ = photo_file_format_get_properties (photo_get_file_format (self)); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_; + _tmp9_ = _tmp8_; #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp10_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp11_ = _tmp10_; #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_file_format_properties_convert_file_extension (_tmp14_, _tmp16_); + _tmp12_ = photo_file_format_properties_convert_file_extension (_tmp9_, _tmp11_); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_; + _tmp13_ = _tmp12_; #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = g_file_get_basename (_tmp18_); + _tmp14_ = g_file_get_basename (_tmp13_); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp15_ = _tmp14_; #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp13_); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp11_); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_format_properties_unref0 (_tmp14_); + _photo_file_format_properties_unref0 (_tmp9_); #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp20_; + result = _tmp15_; #line 3572 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25702 "Photo.c" +#line 25947 "Photo.c" } else { - PhotoFileFormat _tmp21_; - PhotoFileFormatProperties* _tmp22_; - PhotoFileFormatProperties* _tmp23_; - GFile* _tmp24_; - GFile* _tmp25_; - GFile* _tmp26_; - GFile* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; -#line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_file_format_get_system_default_format (); + PhotoFileFormatProperties* _tmp16_; + PhotoFileFormatProperties* _tmp17_; + GFile* _tmp18_; + GFile* _tmp19_; + GFile* _tmp20_; + GFile* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo_file_format_get_properties (_tmp21_); + _tmp16_ = photo_file_format_get_properties (photo_file_format_get_system_default_format ()); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_; + _tmp17_ = _tmp16_; #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp18_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_; + _tmp19_ = _tmp18_; #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = photo_file_format_properties_convert_file_extension (_tmp23_, _tmp25_); + _tmp20_ = photo_file_format_properties_convert_file_extension (_tmp17_, _tmp19_); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_; + _tmp21_ = _tmp20_; #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = g_file_get_basename (_tmp27_); + _tmp22_ = g_file_get_basename (_tmp21_); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_; + _tmp23_ = _tmp22_; #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp21_); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp19_); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_format_properties_unref0 (_tmp23_); + _photo_file_format_properties_unref0 (_tmp17_); #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp29_; + result = _tmp23_; #line 3575 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25741 "Photo.c" +#line 25983 "Photo.c" } } } -static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboolean export_metadata, GError** error) { +static gboolean +photo_export_fullsized_backing (Photo* self, + GFile* file, + gboolean export_metadata, + GError** error) +{ gboolean result = FALSE; PhotoFileReader* export_reader = NULL; gboolean is_master = FALSE; - PhotoFileReader* _tmp30_; + PhotoFileReader* _tmp24_; PhotoFileFormatProperties* format_properties = NULL; - PhotoFileReader* _tmp31_; - PhotoFileFormat _tmp32_; - PhotoFileFormatProperties* _tmp33_; + PhotoFileReader* _tmp25_; + PhotoFileFormatProperties* _tmp26_; GFile* dest_file = NULL; - PhotoFileFormatProperties* _tmp34_; - GFile* _tmp35_; - GFile* _tmp36_; + PhotoFileFormatProperties* _tmp27_; + GFile* _tmp28_; PhotoFileMetadataWriter* writer = NULL; - PhotoFileReader* _tmp37_; - PhotoFileFormat _tmp38_; - GFile* _tmp39_; + PhotoFileReader* _tmp29_; + GFile* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + PhotoFileMetadataWriter* _tmp33_; + PhotoFileMetadataWriter* _tmp34_; + gchar* _tmp36_; + gchar* _tmp37_; + PhotoFileMetadataWriter* _tmp38_; + gchar* _tmp39_; gchar* _tmp40_; - gchar* _tmp41_; - PhotoFileMetadataWriter* _tmp42_; - PhotoFileMetadataWriter* _tmp43_; - gchar* _tmp45_; - gchar* _tmp46_; - PhotoFileMetadataWriter* _tmp47_; - gchar* _tmp48_; - gchar* _tmp49_; - PhotoFileReader* _tmp50_; - GFile* _tmp51_; - GFile* _tmp52_; - GFile* _tmp53_; - gboolean _tmp55_ = FALSE; - gboolean _tmp56_ = FALSE; - gboolean _tmp57_ = FALSE; - gboolean _tmp58_ = FALSE; - gboolean _tmp59_ = FALSE; - gboolean _tmp60_; + PhotoFileReader* _tmp41_; + GFile* _tmp42_; + GFile* _tmp43_; + GFile* _tmp44_; + gboolean _tmp46_ = FALSE; + gboolean _tmp47_ = FALSE; + gboolean _tmp48_ = FALSE; + gboolean _tmp49_ = FALSE; + gboolean _tmp50_ = FALSE; PhotoMetadata* metadata = NULL; - PhotoFileReader* _tmp68_; - PhotoMetadata* _tmp69_; - PhotoMetadata* _tmp71_; - PhotoFileMetadataWriter* _tmp75_; - gchar* _tmp76_; - gchar* _tmp77_; - time_t _tmp78_; - gboolean _tmp84_; - PhotoFileMetadataWriter* _tmp101_; - PhotoMetadata* _tmp102_; + PhotoFileReader* _tmp56_; + PhotoMetadata* _tmp57_; + PhotoMetadata* _tmp59_; + PhotoFileMetadataWriter* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + PhotoFileMetadataWriter* _tmp82_; + PhotoMetadata* _tmp83_; GError * _inner_error_ = NULL; #line 3581 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); @@ -25801,14 +26042,14 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole export_reader = NULL; #line 3585 "/home/jens/Source/shotwell/src/Photo.vala" is_master = TRUE; -#line 25803 "Photo.c" +#line 26044 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 25810 "Photo.c" +#line 26051 "Photo.c" { gboolean _tmp1_ = FALSE; PhotoBackingReaders* _tmp2_; @@ -25819,202 +26060,178 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _tmp3_ = _tmp2_->editable; #line 3587 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ != NULL) { -#line 25821 "Photo.c" +#line 26062 "Photo.c" PhotoBackingReaders* _tmp4_; PhotoFileReader* _tmp5_; - PhotoFileFormat _tmp6_; - gboolean _tmp7_; #line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->readers; #line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp4_->editable; #line 3587 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_file_format_can_write_metadata (_tmp6_); -#line 3587 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp7_; -#line 25836 "Photo.c" + _tmp1_ = photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter))); +#line 26071 "Photo.c" } else { #line 3587 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 25840 "Photo.c" +#line 26075 "Photo.c" } #line 3587 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { -#line 25844 "Photo.c" - PhotoBackingReaders* _tmp8_; - PhotoFileReader* _tmp9_; - PhotoFileReader* _tmp10_; +#line 26079 "Photo.c" + PhotoBackingReaders* _tmp6_; + PhotoFileReader* _tmp7_; + PhotoFileReader* _tmp8_; #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = self->priv->readers; + _tmp6_ = self->priv->readers; #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_->editable; + _tmp7_ = _tmp6_->editable; #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _photo_file_adapter_ref0 (_tmp9_); + _tmp8_ = _photo_file_adapter_ref0 (_tmp7_); #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3588 "/home/jens/Source/shotwell/src/Photo.vala" - export_reader = _tmp10_; + export_reader = _tmp8_; #line 3589 "/home/jens/Source/shotwell/src/Photo.vala" is_master = FALSE; -#line 25860 "Photo.c" +#line 26095 "Photo.c" } else { - gboolean _tmp11_ = FALSE; - PhotoBackingReaders* _tmp12_; - PhotoFileReader* _tmp13_; -#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = self->priv->readers; + gboolean _tmp9_ = FALSE; + PhotoBackingReaders* _tmp10_; + PhotoFileReader* _tmp11_; #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_->developer; + _tmp10_ = self->priv->readers; #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_ != NULL) { -#line 25871 "Photo.c" - PhotoBackingReaders* _tmp14_; - PhotoFileReader* _tmp15_; - PhotoFileFormat _tmp16_; - gboolean _tmp17_; -#line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->priv->readers; + _tmp11_ = _tmp10_->developer; #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->developer; + if (_tmp11_ != NULL) { +#line 26106 "Photo.c" + PhotoBackingReaders* _tmp12_; + PhotoFileReader* _tmp13_; #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp12_ = self->priv->readers; #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_file_format_can_write_metadata (_tmp16_); + _tmp13_ = _tmp12_->developer; #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp17_; -#line 25886 "Photo.c" + _tmp9_ = photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter))); +#line 26115 "Photo.c" } else { #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = FALSE; -#line 25890 "Photo.c" + _tmp9_ = FALSE; +#line 26119 "Photo.c" } #line 3590 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 25894 "Photo.c" - PhotoBackingReaders* _tmp18_; - PhotoFileReader* _tmp19_; - PhotoFileReader* _tmp20_; + if (_tmp9_) { +#line 26123 "Photo.c" + PhotoBackingReaders* _tmp14_; + PhotoFileReader* _tmp15_; + PhotoFileReader* _tmp16_; #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->priv->readers; + _tmp14_ = self->priv->readers; #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->developer; + _tmp15_ = _tmp14_->developer; #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _photo_file_adapter_ref0 (_tmp19_); + _tmp16_ = _photo_file_adapter_ref0 (_tmp15_); #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3591 "/home/jens/Source/shotwell/src/Photo.vala" - export_reader = _tmp20_; + export_reader = _tmp16_; #line 3592 "/home/jens/Source/shotwell/src/Photo.vala" is_master = FALSE; -#line 25910 "Photo.c" +#line 26139 "Photo.c" } else { - PhotoBackingReaders* _tmp21_; - PhotoFileReader* _tmp22_; - PhotoFileFormat _tmp23_; - gboolean _tmp24_; -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = self->priv->readers; -#line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_->master; + PhotoBackingReaders* _tmp17_; + PhotoFileReader* _tmp18_; #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp17_ = self->priv->readers; #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = photo_file_format_can_write_metadata (_tmp23_); + _tmp18_ = _tmp17_->master; #line 3593 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp24_) { -#line 25926 "Photo.c" - PhotoBackingReaders* _tmp25_; - PhotoFileReader* _tmp26_; - PhotoFileReader* _tmp27_; + if (photo_file_format_can_write_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)))) { +#line 26149 "Photo.c" + PhotoBackingReaders* _tmp19_; + PhotoFileReader* _tmp20_; + PhotoFileReader* _tmp21_; #line 3594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->priv->readers; + _tmp19_ = self->priv->readers; #line 3594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_->master; + _tmp20_ = _tmp19_->master; #line 3594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _photo_file_adapter_ref0 (_tmp26_); + _tmp21_ = _photo_file_adapter_ref0 (_tmp20_); #line 3594 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3594 "/home/jens/Source/shotwell/src/Photo.vala" - export_reader = _tmp27_; -#line 25940 "Photo.c" + export_reader = _tmp21_; +#line 26163 "Photo.c" } } } } __finally398: { - PhotoBackingReaders* _tmp28_; + PhotoBackingReaders* _tmp22_; #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = self->priv->readers; + _tmp22_ = self->priv->readers; #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 25952 "Photo.c" +#line 26175 "Photo.c" } #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 25956 "Photo.c" - gboolean _tmp29_ = FALSE; +#line 26179 "Photo.c" + gboolean _tmp23_ = FALSE; #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3586 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp29_; -#line 25964 "Photo.c" + return _tmp23_; +#line 26187 "Photo.c" } } #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = export_reader; + _tmp24_ = export_reader; #line 3598 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp30_ == NULL) { + if (_tmp24_ == NULL) { #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3599 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 25977 "Photo.c" +#line 26200 "Photo.c" } #line 3601 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = export_reader; -#line 3601 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp25_ = export_reader; #line 3601 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = photo_file_format_get_properties (_tmp32_); + _tmp26_ = photo_file_format_get_properties (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter))); #line 3601 "/home/jens/Source/shotwell/src/Photo.vala" - format_properties = _tmp33_; + format_properties = _tmp26_; #line 3604 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = format_properties; + _tmp27_ = format_properties; #line 3604 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = file; + _tmp28_ = photo_file_format_properties_convert_file_extension (_tmp27_, file); #line 3604 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = photo_file_format_properties_convert_file_extension (_tmp34_, _tmp35_); -#line 3604 "/home/jens/Source/shotwell/src/Photo.vala" - dest_file = _tmp36_; -#line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = export_reader; + dest_file = _tmp28_; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp29_ = export_reader; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = dest_file; + _tmp30_ = dest_file; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = g_file_get_path (_tmp39_); + _tmp31_ = g_file_get_path (_tmp30_); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_; + _tmp32_ = _tmp31_; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = photo_file_format_create_metadata_writer (_tmp38_, _tmp41_, &_inner_error_); + _tmp33_ = photo_file_format_create_metadata_writer (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp32_, &_inner_error_); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp42_; + _tmp34_ = _tmp33_; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp41_); + _g_free0 (_tmp32_); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp43_; + writer = _tmp34_; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 26015 "Photo.c" - gboolean _tmp44_ = FALSE; +#line 26232 "Photo.c" + gboolean _tmp35_ = FALSE; #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26024,41 +26241,41 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3607 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp44_; -#line 26027 "Photo.c" + return _tmp35_; +#line 26244 "Photo.c" } #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp36_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = _tmp45_; + _tmp37_ = _tmp36_; #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = writer; + _tmp38_ = writer; #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp39_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_; + _tmp40_ = _tmp39_; #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3610: Exporting full-sized copy of %s to %s", _tmp46_, _tmp49_); + g_debug ("Photo.vala:3610: Exporting full-sized copy of %s to %s", _tmp37_, _tmp40_); #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp49_); + _g_free0 (_tmp40_); #line 3610 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp37_); #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = export_reader; + _tmp41_ = export_reader; #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp42_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = _tmp51_; + _tmp43_ = _tmp42_; #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = dest_file; + _tmp44_ = dest_file; #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_copy (_tmp52_, _tmp53_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); + g_file_copy (_tmp43_, _tmp44_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp52_); + _g_object_unref0 (_tmp43_); #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 26059 "Photo.c" - gboolean _tmp54_ = FALSE; +#line 26276 "Photo.c" + gboolean _tmp45_ = FALSE; #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26070,93 +26287,83 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3612 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp54_; -#line 26073 "Photo.c" + return _tmp45_; +#line 26290 "Photo.c" } #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = photo_has_alterations (self); -#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp60_) { -#line 26079 "Photo.c" - gboolean _tmp61_; + if (!photo_has_alterations (self)) { +#line 26294 "Photo.c" + gboolean _tmp51_; #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = is_master; + _tmp51_ = is_master; #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = _tmp61_; -#line 26085 "Photo.c" + _tmp50_ = _tmp51_; +#line 26300 "Photo.c" } else { #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = FALSE; -#line 26089 "Photo.c" + _tmp50_ = FALSE; +#line 26304 "Photo.c" } #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp59_) { -#line 26093 "Photo.c" - gboolean _tmp62_; -#line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = photo_has_user_generated_metadata (self); + if (_tmp50_) { #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = !_tmp62_; -#line 26099 "Photo.c" + _tmp49_ = !photo_has_user_generated_metadata (self); +#line 26310 "Photo.c" } else { #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = FALSE; -#line 26103 "Photo.c" + _tmp49_ = FALSE; +#line 26314 "Photo.c" } #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp58_) { -#line 26107 "Photo.c" - gchar* _tmp63_; - gchar* _tmp64_; + if (_tmp49_) { +#line 26318 "Photo.c" + gchar* _tmp52_; + gchar* _tmp53_; #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp52_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = _tmp63_; + _tmp53_ = _tmp52_; #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = _tmp64_ == NULL; + _tmp48_ = _tmp53_ == NULL; #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp64_); -#line 26118 "Photo.c" + _g_free0 (_tmp53_); +#line 26329 "Photo.c" } else { #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = FALSE; -#line 26122 "Photo.c" + _tmp48_ = FALSE; +#line 26333 "Photo.c" } #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp57_) { -#line 26126 "Photo.c" - gchar* _tmp65_; - gchar* _tmp66_; + if (_tmp48_) { +#line 26337 "Photo.c" + gchar* _tmp54_; + gchar* _tmp55_; #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp54_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = _tmp65_; + _tmp55_ = _tmp54_; #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = _tmp66_ == NULL; + _tmp47_ = _tmp55_ == NULL; #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp66_); -#line 26137 "Photo.c" + _g_free0 (_tmp55_); +#line 26348 "Photo.c" } else { #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = FALSE; -#line 26141 "Photo.c" + _tmp47_ = FALSE; +#line 26352 "Photo.c" } #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp56_) { -#line 26145 "Photo.c" - gboolean _tmp67_; -#line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = export_metadata; + if (_tmp47_) { #line 3618 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = _tmp67_; -#line 26151 "Photo.c" + _tmp46_ = export_metadata; +#line 26358 "Photo.c" } else { #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = FALSE; -#line 26155 "Photo.c" + _tmp46_ = FALSE; +#line 26362 "Photo.c" } #line 3617 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp55_) { + if (_tmp46_) { #line 3619 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 3619 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26169,18 +26376,18 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _photo_file_adapter_unref0 (export_reader); #line 3619 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 26171 "Photo.c" +#line 26378 "Photo.c" } #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = export_reader; + _tmp56_ = export_reader; #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = photo_file_reader_read_metadata (_tmp68_, &_inner_error_); + _tmp57_ = photo_file_reader_read_metadata (_tmp56_, &_inner_error_); #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp69_; + metadata = _tmp57_; #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 26181 "Photo.c" - gboolean _tmp70_ = FALSE; +#line 26388 "Photo.c" + gboolean _tmp58_ = FALSE; #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26192,161 +26399,142 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3622 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp70_; -#line 26195 "Photo.c" + return _tmp58_; +#line 26402 "Photo.c" } #line 3623 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = metadata; + _tmp59_ = metadata; #line 3623 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp71_ == NULL) { -#line 26201 "Photo.c" - PhotoFileReader* _tmp72_; - PhotoFileFormat _tmp73_; - PhotoMetadata* _tmp74_; -#line 3624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = export_reader; + if (_tmp59_ == NULL) { +#line 26408 "Photo.c" + PhotoFileReader* _tmp60_; + PhotoMetadata* _tmp61_; #line 3624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp60_ = export_reader; #line 3624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = photo_file_format_create_metadata (_tmp73_); + _tmp61_ = photo_file_format_create_metadata (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter))); #line 3624 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); #line 3624 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp74_; -#line 26215 "Photo.c" + metadata = _tmp61_; +#line 26419 "Photo.c" } #line 3626 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = writer; + _tmp62_ = writer; #line 3626 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp63_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3626 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = _tmp76_; + _tmp64_ = _tmp63_; #line 3626 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3626: Updating metadata of %s", _tmp77_); + g_debug ("Photo.vala:3626: Updating metadata of %s", _tmp64_); #line 3626 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp77_); -#line 3628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _g_free0 (_tmp64_); #line 3628 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp78_ != ((time_t) 0)) { -#line 26231 "Photo.c" - PhotoMetadata* _tmp79_; - time_t _tmp80_; - MetadataDateTime* _tmp81_; - MetadataDateTime* _tmp82_; + if (media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)) != ((time_t) 0)) { +#line 26433 "Photo.c" + PhotoMetadata* _tmp65_; + MetadataDateTime* _tmp66_; + MetadataDateTime* _tmp67_; #line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = metadata; + _tmp65_ = metadata; #line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp66_ = metadata_date_time_new (media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource))); #line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = metadata_date_time_new (_tmp80_); + _tmp67_ = _tmp66_; #line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = _tmp81_; + photo_metadata_set_exposure_date_time (_tmp65_, _tmp67_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_exposure_date_time (_tmp79_, _tmp82_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 3629 "/home/jens/Source/shotwell/src/Photo.vala" - _metadata_date_time_unref0 (_tmp82_); -#line 26248 "Photo.c" + _metadata_date_time_unref0 (_tmp67_); +#line 26447 "Photo.c" } else { - PhotoMetadata* _tmp83_; + PhotoMetadata* _tmp68_; #line 3631 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = metadata; + _tmp68_ = metadata; #line 3631 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_exposure_date_time (_tmp83_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 26255 "Photo.c" + photo_metadata_set_exposure_date_time (_tmp68_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); +#line 26454 "Photo.c" } #line 3633 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = export_metadata; -#line 3633 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp84_) { -#line 26261 "Photo.c" - PhotoMetadata* _tmp85_; - gchar* _tmp86_; - gchar* _tmp87_; - PhotoMetadata* _tmp88_; - gchar* _tmp89_; - gchar* _tmp90_; - PhotoMetadata* _tmp91_; - Dimensions _tmp92_ = {0}; - PhotoMetadata* _tmp93_; - Orientation _tmp94_; - PhotoMetadata* _tmp95_; - Orientation _tmp96_; - Orientation _tmp97_; - PhotoMetadata* _tmp99_; + if (export_metadata) { +#line 26458 "Photo.c" + PhotoMetadata* _tmp69_; + gchar* _tmp70_; + gchar* _tmp71_; + PhotoMetadata* _tmp72_; + gchar* _tmp73_; + gchar* _tmp74_; + PhotoMetadata* _tmp75_; + Dimensions _tmp76_ = {0}; + PhotoMetadata* _tmp77_; + PhotoMetadata* _tmp78_; + PhotoMetadata* _tmp80_; #line 3635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = metadata; + _tmp69_ = metadata; #line 3635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp70_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3635 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = _tmp86_; + _tmp71_ = _tmp70_; #line 3635 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_title (_tmp85_, _tmp87_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_title (_tmp69_, _tmp71_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3635 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp87_); + _g_free0 (_tmp71_); #line 3636 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = metadata; + _tmp72_ = metadata; #line 3636 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp73_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3636 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp89_; + _tmp74_ = _tmp73_; #line 3636 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_comment (_tmp88_, _tmp90_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_comment (_tmp72_, _tmp74_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3636 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp90_); + _g_free0 (_tmp74_); #line 3637 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = metadata; + _tmp75_ = metadata; #line 3637 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp92_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp76_); #line 3637 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_pixel_dimensions (_tmp91_, &_tmp92_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_pixel_dimensions (_tmp75_, &_tmp76_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = metadata; + _tmp77_ = metadata; #line 3638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = photo_get_orientation (self); -#line 3638 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_orientation (_tmp93_, _tmp94_); + photo_metadata_set_orientation (_tmp77_, photo_get_orientation (self)); #line 3639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = metadata; + _tmp78_ = metadata; #line 3639 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_software (_tmp95_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); + photo_metadata_set_software (_tmp78_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); #line 3641 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = photo_get_orientation (self); -#line 3641 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = photo_get_original_orientation (self); -#line 3641 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp96_ != _tmp97_) { -#line 26318 "Photo.c" - PhotoMetadata* _tmp98_; + if (photo_get_orientation (self) != photo_get_original_orientation (self)) { +#line 26506 "Photo.c" + PhotoMetadata* _tmp79_; #line 3642 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = metadata; + _tmp79_ = metadata; #line 3642 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_remove_exif_thumbnail (_tmp98_); -#line 26324 "Photo.c" + photo_metadata_remove_exif_thumbnail (_tmp79_); +#line 26512 "Photo.c" } #line 3644 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = metadata; + _tmp80_ = metadata; #line 3644 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_user_metadata_for_export (self, _tmp99_); -#line 26330 "Photo.c" + photo_set_user_metadata_for_export (self, _tmp80_); +#line 26518 "Photo.c" } else { - PhotoMetadata* _tmp100_; + PhotoMetadata* _tmp81_; #line 3648 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = metadata; + _tmp81_ = metadata; #line 3648 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_clear (_tmp100_); -#line 26337 "Photo.c" + photo_metadata_clear (_tmp81_); +#line 26525 "Photo.c" } #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = writer; + _tmp82_ = writer; #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = metadata; + _tmp83_ = metadata; #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp101_, _tmp102_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp82_, _tmp83_, &_inner_error_); #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 26347 "Photo.c" - gboolean _tmp103_ = FALSE; +#line 26535 "Photo.c" + gboolean _tmp84_ = FALSE; #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26360,8 +26548,8 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (export_reader); #line 3650 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp103_; -#line 26363 "Photo.c" + return _tmp84_; +#line 26551 "Photo.c" } #line 3652 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -26377,117 +26565,102 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole _photo_file_adapter_unref0 (export_reader); #line 3652 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 26379 "Photo.c" +#line 26567 "Photo.c" } -gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileFormat export_format) { +gboolean +photo_is_export_required (Photo* self, + Scaling* scaling, + PhotoFileFormat export_format) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gboolean _tmp3_; #line 3658 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 3658 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (scaling != NULL, FALSE); #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = scaling_is_unscaled (scaling); -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp3_) { + if (!scaling_is_unscaled (scaling)) { #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = TRUE; -#line 26399 "Photo.c" +#line 26588 "Photo.c" } else { - gboolean _tmp4_; -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_has_alterations (self); #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _tmp4_; -#line 26406 "Photo.c" + _tmp2_ = photo_has_alterations (self); +#line 26592 "Photo.c" } #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_) { #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = TRUE; -#line 26412 "Photo.c" +#line 26598 "Photo.c" } else { - gboolean _tmp5_; -#line 3659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_has_user_generated_metadata (self); #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp5_; -#line 26419 "Photo.c" + _tmp1_ = photo_has_user_generated_metadata (self); +#line 26602 "Photo.c" } #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 26425 "Photo.c" +#line 26608 "Photo.c" } else { - PhotoFileFormat _tmp6_; - PhotoFileFormat _tmp7_; -#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = export_format; #line 3660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_get_file_format (self); -#line 3660 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp6_ != _tmp7_; -#line 26435 "Photo.c" + _tmp0_ = export_format != photo_get_file_format (self); +#line 26612 "Photo.c" } #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp0_; #line 3659 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 26441 "Photo.c" +#line 26618 "Photo.c" } -void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error) { - gboolean _tmp0_; +void +photo_export (Photo* self, + GFile* dest_file, + Scaling* scaling, + JpegQuality quality, + PhotoFileFormat export_format, + gboolean direct_copy_unmodified, + gboolean export_metadata, + GError** error) +{ + gboolean _tmp2_ = FALSE; + gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_; PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp18_; - PhotoMetadata* _tmp19_; - PhotoFileFormat _tmp22_; - gboolean _tmp23_; + PhotoMetadata* _tmp7_; + PhotoMetadata* _tmp8_; PhotoFileWriter* writer = NULL; - PhotoFileFormat _tmp25_; - GFile* _tmp26_; - gchar* _tmp27_; - gchar* _tmp28_; + gchar* _tmp10_; + gchar* _tmp11_; + PhotoFileWriter* _tmp12_; + PhotoFileWriter* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + PhotoFileWriter* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + GEnumValue* _tmp19_; + GdkPixbuf* pixbuf = NULL; + gboolean _tmp20_ = FALSE; PhotoFileWriter* _tmp29_; - PhotoFileWriter* _tmp30_; - gchar* _tmp31_; + GdkPixbuf* _tmp30_; + PhotoFileWriter* _tmp31_; gchar* _tmp32_; - PhotoFileWriter* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - PhotoFileFormat _tmp36_; - GEnumValue* _tmp37_; - GdkPixbuf* pixbuf = NULL; - gboolean _tmp38_ = FALSE; - PhotoFileFormat _tmp39_; - PhotoFileWriter* _tmp49_; - GdkPixbuf* _tmp50_; - JpegQuality _tmp51_; - PhotoFileWriter* _tmp52_; - gchar* _tmp53_; - gchar* _tmp54_; - gboolean _tmp55_; - gboolean _tmp75_ = FALSE; - PhotoFileFormat _tmp76_; - PhotoFileMetadataWriter* _tmp86_ = NULL; - PhotoFileFormat _tmp87_; - GFile* _tmp88_; - gchar* _tmp89_; - gchar* _tmp90_; - PhotoFileMetadataWriter* _tmp91_; - PhotoFileMetadataWriter* _tmp92_; - PhotoMetadata* _tmp93_; + gchar* _tmp33_; + gboolean _tmp50_ = FALSE; + PhotoFileMetadataWriter* _tmp58_ = NULL; + gchar* _tmp59_; + gchar* _tmp60_; + PhotoFileMetadataWriter* _tmp61_; + PhotoFileMetadataWriter* _tmp62_; + PhotoMetadata* _tmp63_; GError * _inner_error_ = NULL; #line 3666 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -26496,177 +26669,129 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality #line 3666 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (scaling != NULL); #line 3668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = direct_copy_unmodified; -#line 3668 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_) { -#line 26501 "Photo.c" + if (direct_copy_unmodified) { +#line 26672 "Photo.c" + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; - GFile* _tmp3_; #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp0_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _tmp1_; -#line 3669 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = dest_file; + _tmp1_ = _tmp0_; #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_copy (_tmp2_, _tmp3_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); + g_file_copy (_tmp1_, dest_file, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_); #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3669 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26521 "Photo.c" +#line 26689 "Photo.c" } #line 3671 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26525 "Photo.c" +#line 26693 "Photo.c" } #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = scaling_is_unscaled (scaling); -#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_) { -#line 26531 "Photo.c" - gboolean _tmp8_ = FALSE; - gboolean _tmp9_; -#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_has_alterations (self); + if (scaling_is_unscaled (scaling)) { +#line 26697 "Photo.c" + gboolean _tmp5_ = FALSE; #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp9_) { + if (!photo_has_alterations (self)) { #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = TRUE; -#line 26540 "Photo.c" + _tmp5_ = TRUE; +#line 26703 "Photo.c" } else { - gboolean _tmp10_; #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_only_metadata_changed (self); -#line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp10_; -#line 26547 "Photo.c" + _tmp5_ = photo_only_metadata_changed (self); +#line 26707 "Photo.c" } #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp8_; -#line 26551 "Photo.c" + _tmp4_ = _tmp5_; +#line 26711 "Photo.c" } else { #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = FALSE; -#line 26555 "Photo.c" + _tmp4_ = FALSE; +#line 26715 "Photo.c" } #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { -#line 26559 "Photo.c" - PhotoFileFormat _tmp11_; - PhotoFileFormat _tmp12_; -#line 3679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = export_format; -#line 3679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo_get_file_format (self); + if (_tmp4_) { #line 3679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp11_ == _tmp12_; -#line 26568 "Photo.c" + _tmp3_ = export_format == photo_get_file_format (self); +#line 26721 "Photo.c" } else { #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = FALSE; -#line 26572 "Photo.c" + _tmp3_ = FALSE; +#line 26725 "Photo.c" } #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 26576 "Photo.c" - PhotoFileFormat _tmp13_; -#line 3679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_get_file_format (self); + if (_tmp3_) { #line 3679 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp13_ == PHOTO_FILE_FORMAT_JFIF; -#line 26582 "Photo.c" + _tmp2_ = photo_get_file_format (self) == PHOTO_FILE_FORMAT_JFIF; +#line 26731 "Photo.c" } else { #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = FALSE; -#line 26586 "Photo.c" + _tmp2_ = FALSE; +#line 26735 "Photo.c" } #line 3678 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp4_) { -#line 26590 "Photo.c" - gboolean _tmp14_ = FALSE; - GFile* _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; -#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = dest_file; -#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = export_metadata; -#line 3680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_export_fullsized_backing (self, _tmp15_, _tmp16_, &_inner_error_); + if (_tmp2_) { +#line 26739 "Photo.c" + gboolean _tmp6_ = FALSE; #line 3680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp17_; + _tmp6_ = photo_export_fullsized_backing (self, dest_file, export_metadata, &_inner_error_); #line 3680 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3680 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3680 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26609 "Photo.c" +#line 26749 "Photo.c" } #line 3680 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_) { + if (_tmp6_) { #line 3681 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26615 "Photo.c" +#line 26755 "Photo.c" } } #line 3687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource)); + _tmp7_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource)); #line 3687 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp18_; + metadata = _tmp7_; #line 3688 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = metadata; + _tmp8_ = metadata; #line 3688 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp19_ == NULL) { -#line 26626 "Photo.c" - PhotoFileFormat _tmp20_; - PhotoMetadata* _tmp21_; -#line 3689 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = export_format; + if (_tmp8_ == NULL) { +#line 26766 "Photo.c" + PhotoMetadata* _tmp9_; #line 3689 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_file_format_create_metadata (_tmp20_); + _tmp9_ = photo_file_format_create_metadata (export_format); #line 3689 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); #line 3689 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp21_; -#line 26637 "Photo.c" + metadata = _tmp9_; +#line 26774 "Photo.c" } #line 3691 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = export_format; -#line 3691 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo_file_format_can_write (_tmp22_); -#line 3691 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp23_) { -#line 26645 "Photo.c" - PhotoFileFormat _tmp24_; + if (!photo_file_format_can_write (export_format)) { #line 3692 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = photo_file_format_get_system_default_format (); -#line 3692 "/home/jens/Source/shotwell/src/Photo.vala" - export_format = _tmp24_; -#line 26651 "Photo.c" + export_format = photo_file_format_get_system_default_format (); +#line 26780 "Photo.c" } #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = export_format; -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = dest_file; + _tmp10_ = g_file_get_path (dest_file); #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = g_file_get_path (_tmp26_); -#line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_; + _tmp11_ = _tmp10_; #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = photo_file_format_create_writer (_tmp25_, _tmp28_, &_inner_error_); + _tmp12_ = photo_file_format_create_writer (export_format, _tmp11_, &_inner_error_); #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_; + _tmp13_ = _tmp12_; #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp28_); + _g_free0 (_tmp11_); #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" - writer = _tmp30_; + writer = _tmp13_; #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26675,57 +26800,50 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3694 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26677 "Photo.c" +#line 26802 "Photo.c" } #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); -#line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_; + _tmp14_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = writer; + _tmp15_ = _tmp14_; #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp16_ = writer; #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_; + _tmp17_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = export_format; + _tmp18_ = _tmp17_; #line 3697 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), _tmp36_); + _tmp19_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), export_format); #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" g_debug ("Photo.vala:3696: Saving transformed version of %s to %s in file format" \ -" %s", _tmp32_, _tmp35_, (_tmp37_ != NULL) ? _tmp37_->value_name : NULL); +" %s", _tmp15_, _tmp18_, (_tmp19_ != NULL) ? _tmp19_->value_name : NULL); #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp18_); #line 3696 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp15_); #line 3703 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = photo_get_file_format (self); + if (photo_get_file_format (self) == PHOTO_FILE_FORMAT_JFIF) { #line 3703 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp39_ == PHOTO_FILE_FORMAT_JFIF) { -#line 3703 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = TRUE; -#line 26705 "Photo.c" + _tmp20_ = TRUE; +#line 26826 "Photo.c" } else { - PhotoFileFormat _tmp40_; -#line 3704 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = photo_get_file_format (self); #line 3704 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp40_ == PHOTO_FILE_FORMAT_RAW; -#line 26712 "Photo.c" + _tmp20_ = photo_get_file_format (self) == PHOTO_FILE_FORMAT_RAW; +#line 26830 "Photo.c" } #line 3703 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp38_) { -#line 26716 "Photo.c" - GdkPixbuf* _tmp41_ = NULL; - Scaling _tmp42_; - GdkPixbuf* _tmp43_; - GdkPixbuf* _tmp44_; + if (_tmp20_) { +#line 26834 "Photo.c" + GdkPixbuf* _tmp21_ = NULL; + Scaling _tmp22_; + GdkPixbuf* _tmp23_; + GdkPixbuf* _tmp24_; #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = *scaling; + _tmp22_ = *scaling; #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = photo_get_pixbuf_with_options (self, &_tmp42_, PHOTO_EXCEPTION_ORIENTATION, BACKING_FETCH_MODE_SOURCE, &_inner_error_); + _tmp23_ = photo_get_pixbuf_with_options (self, &_tmp22_, PHOTO_EXCEPTION_ORIENTATION, BACKING_FETCH_MODE_SOURCE, &_inner_error_); #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp43_; + _tmp21_ = _tmp23_; #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26738,30 +26856,30 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26739 "Photo.c" +#line 26857 "Photo.c" } #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp41_; + _tmp24_ = _tmp21_; #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = NULL; + _tmp21_ = NULL; #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3705 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp44_; + pixbuf = _tmp24_; #line 3703 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp41_); -#line 26751 "Photo.c" + _g_object_unref0 (_tmp21_); +#line 26869 "Photo.c" } else { - GdkPixbuf* _tmp45_ = NULL; - Scaling _tmp46_; - GdkPixbuf* _tmp47_; - GdkPixbuf* _tmp48_; + GdkPixbuf* _tmp25_ = NULL; + Scaling _tmp26_; + GdkPixbuf* _tmp27_; + GdkPixbuf* _tmp28_; #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = *scaling; + _tmp26_ = *scaling; #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = photo_get_pixbuf_with_options (self, &_tmp46_, PHOTO_EXCEPTION_NONE, BACKING_FETCH_MODE_SOURCE, &_inner_error_); + _tmp27_ = photo_get_pixbuf_with_options (self, &_tmp26_, PHOTO_EXCEPTION_NONE, BACKING_FETCH_MODE_SOURCE, &_inner_error_); #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _tmp47_; + _tmp25_ = _tmp27_; #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26774,28 +26892,26 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26775 "Photo.c" +#line 26893 "Photo.c" } #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp45_; + _tmp28_ = _tmp25_; #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = NULL; + _tmp25_ = NULL; #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3709 "/home/jens/Source/shotwell/src/Photo.vala" - pixbuf = _tmp48_; + pixbuf = _tmp28_; #line 3703 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp45_); -#line 26787 "Photo.c" + _g_object_unref0 (_tmp25_); +#line 26905 "Photo.c" } #line 3713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = writer; + _tmp29_ = writer; #line 3713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = pixbuf; + _tmp30_ = pixbuf; #line 3713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = quality; -#line 3713 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_writer_write (_tmp49_, _tmp50_, _tmp51_, &_inner_error_); + photo_file_writer_write (_tmp29_, _tmp30_, quality, &_inner_error_); #line 3713 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3713 "/home/jens/Source/shotwell/src/Photo.vala" @@ -26808,191 +26924,168 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3713 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 26809 "Photo.c" +#line 26925 "Photo.c" } #line 3715 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = writer; + _tmp31_ = writer; #line 3715 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp32_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3715 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = _tmp53_; + _tmp33_ = _tmp32_; #line 3715 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:3715: Setting EXIF for %s", _tmp54_); + g_debug ("Photo.vala:3715: Setting EXIF for %s", _tmp33_); #line 3715 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp54_); + _g_free0 (_tmp33_); #line 3718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = export_metadata; -#line 3718 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp55_) { -#line 26825 "Photo.c" - PhotoMetadata* _tmp56_; - gchar* _tmp57_; - gchar* _tmp58_; - PhotoMetadata* _tmp59_; - gchar* _tmp60_; - gchar* _tmp61_; - PhotoMetadata* _tmp62_; - time_t _tmp63_; - PhotoMetadata* _tmp69_; - PhotoMetadata* _tmp70_; - PhotoMetadata* _tmp71_; - gboolean _tmp72_; + if (export_metadata) { +#line 26939 "Photo.c" + PhotoMetadata* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + PhotoMetadata* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; + PhotoMetadata* _tmp40_; + PhotoMetadata* _tmp45_; + PhotoMetadata* _tmp46_; + PhotoMetadata* _tmp47_; #line 3720 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = metadata; + _tmp34_ = metadata; #line 3720 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp35_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3720 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _tmp57_; + _tmp36_ = _tmp35_; #line 3720 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_title (_tmp56_, _tmp58_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_title (_tmp34_, _tmp36_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3720 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp58_); + _g_free0 (_tmp36_); #line 3721 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = metadata; + _tmp37_ = metadata; #line 3721 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp38_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3721 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _tmp60_; + _tmp39_ = _tmp38_; #line 3721 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_comment (_tmp59_, _tmp61_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_comment (_tmp37_, _tmp39_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3721 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp61_); + _g_free0 (_tmp39_); #line 3722 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = metadata; + _tmp40_ = metadata; #line 3722 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_software (_tmp62_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); + photo_metadata_set_software (_tmp40_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); #line 3724 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 3724 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp63_ != ((time_t) 0)) { -#line 26866 "Photo.c" - PhotoMetadata* _tmp64_; - time_t _tmp65_; - MetadataDateTime* _tmp66_; - MetadataDateTime* _tmp67_; -#line 3725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = metadata; + if (media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)) != ((time_t) 0)) { +#line 26976 "Photo.c" + PhotoMetadata* _tmp41_; + MetadataDateTime* _tmp42_; + MetadataDateTime* _tmp43_; #line 3725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp41_ = metadata; #line 3725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = metadata_date_time_new (_tmp65_); + _tmp42_ = metadata_date_time_new (media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource))); #line 3725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = _tmp66_; + _tmp43_ = _tmp42_; #line 3725 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_exposure_date_time (_tmp64_, _tmp67_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_exposure_date_time (_tmp41_, _tmp43_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3725 "/home/jens/Source/shotwell/src/Photo.vala" - _metadata_date_time_unref0 (_tmp67_); -#line 26883 "Photo.c" + _metadata_date_time_unref0 (_tmp43_); +#line 26990 "Photo.c" } else { - PhotoMetadata* _tmp68_; + PhotoMetadata* _tmp44_; #line 3727 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = metadata; + _tmp44_ = metadata; #line 3727 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_exposure_date_time (_tmp68_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 26890 "Photo.c" + photo_metadata_set_exposure_date_time (_tmp44_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); +#line 26997 "Photo.c" } #line 3729 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = metadata; + _tmp45_ = metadata; #line 3729 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_remove_tag (_tmp69_, "Exif.Iop.RelatedImageWidth"); + photo_metadata_remove_tag (_tmp45_, "Exif.Iop.RelatedImageWidth"); #line 3730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = metadata; + _tmp46_ = metadata; #line 3730 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_remove_tag (_tmp70_, "Exif.Iop.RelatedImageHeight"); + photo_metadata_remove_tag (_tmp46_, "Exif.Iop.RelatedImageHeight"); #line 3731 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = metadata; + _tmp47_ = metadata; #line 3731 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_remove_exif_thumbnail (_tmp71_); -#line 3733 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = photo_has_user_generated_metadata (self); + photo_metadata_remove_exif_thumbnail (_tmp47_); #line 3733 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp72_) { -#line 26908 "Photo.c" - PhotoMetadata* _tmp73_; + if (photo_has_user_generated_metadata (self)) { +#line 27013 "Photo.c" + PhotoMetadata* _tmp48_; #line 3734 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = metadata; + _tmp48_ = metadata; #line 3734 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_user_metadata_for_export (self, _tmp73_); -#line 26914 "Photo.c" + photo_set_user_metadata_for_export (self, _tmp48_); +#line 27019 "Photo.c" } } else { - PhotoMetadata* _tmp74_; + PhotoMetadata* _tmp49_; #line 3738 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = metadata; + _tmp49_ = metadata; #line 3738 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_clear (_tmp74_); -#line 26922 "Photo.c" + photo_metadata_clear (_tmp49_); +#line 27027 "Photo.c" } #line 3745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = photo_get_file_format (self); + if (photo_get_file_format (self) == PHOTO_FILE_FORMAT_JFIF) { #line 3745 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp76_ == PHOTO_FILE_FORMAT_JFIF) { -#line 3745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = TRUE; -#line 26930 "Photo.c" + _tmp50_ = TRUE; +#line 27033 "Photo.c" } else { - PhotoFileFormat _tmp77_; -#line 3746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = photo_get_file_format (self); #line 3746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = _tmp77_ == PHOTO_FILE_FORMAT_RAW; -#line 26937 "Photo.c" + _tmp50_ = photo_get_file_format (self) == PHOTO_FILE_FORMAT_RAW; +#line 27037 "Photo.c" } #line 3745 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp75_) { -#line 26941 "Photo.c" - PhotoMetadata* _tmp78_; - Dimensions _tmp79_ = {0}; - PhotoMetadata* _tmp80_; - Orientation _tmp81_; + if (_tmp50_) { +#line 27041 "Photo.c" + PhotoMetadata* _tmp51_; + Dimensions _tmp52_ = {0}; + PhotoMetadata* _tmp53_; #line 3747 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = metadata; + _tmp51_ = metadata; #line 3747 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ORIENTATION, &_tmp79_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ORIENTATION, &_tmp52_); #line 3747 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_pixel_dimensions (_tmp78_, &_tmp79_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_pixel_dimensions (_tmp51_, &_tmp52_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3748 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = metadata; -#line 3748 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = photo_get_orientation (self); + _tmp53_ = metadata; #line 3748 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_orientation (_tmp80_, _tmp81_); -#line 26958 "Photo.c" + photo_metadata_set_orientation (_tmp53_, photo_get_orientation (self)); +#line 27055 "Photo.c" } else { - PhotoMetadata* _tmp82_; - GdkPixbuf* _tmp83_; - Dimensions _tmp84_ = {0}; - PhotoMetadata* _tmp85_; + PhotoMetadata* _tmp54_; + GdkPixbuf* _tmp55_; + Dimensions _tmp56_ = {0}; + PhotoMetadata* _tmp57_; #line 3751 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = metadata; + _tmp54_ = metadata; #line 3751 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = pixbuf; + _tmp55_ = pixbuf; #line 3751 "/home/jens/Source/shotwell/src/Photo.vala" - dimensions_for_pixbuf (_tmp83_, &_tmp84_); + dimensions_for_pixbuf (_tmp55_, &_tmp56_); #line 3751 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_pixel_dimensions (_tmp82_, &_tmp84_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_pixel_dimensions (_tmp54_, &_tmp56_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 3752 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = metadata; + _tmp57_ = metadata; #line 3752 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_orientation (_tmp85_, ORIENTATION_TOP_LEFT); -#line 26976 "Photo.c" + photo_metadata_set_orientation (_tmp57_, ORIENTATION_TOP_LEFT); +#line 27073 "Photo.c" } #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = export_format; -#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = dest_file; -#line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = g_file_get_path (_tmp88_); + _tmp59_ = g_file_get_path (dest_file); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp89_; + _tmp60_ = _tmp59_; #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = photo_file_format_create_metadata_writer (_tmp87_, _tmp90_, &_inner_error_); + _tmp61_ = photo_file_format_create_metadata_writer (export_format, _tmp60_, &_inner_error_); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = _tmp91_; + _tmp62_ = _tmp61_; #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp90_); + _g_free0 (_tmp60_); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = _tmp92_; + _tmp58_ = _tmp62_; #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27005,18 +27098,18 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27006 "Photo.c" +#line 27099 "Photo.c" } #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = metadata; + _tmp63_ = metadata; #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - photo_file_metadata_writer_write_metadata (_tmp86_, _tmp93_, &_inner_error_); + photo_file_metadata_writer_write_metadata (_tmp58_, _tmp63_, &_inner_error_); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp86_); + _photo_file_adapter_unref0 (_tmp58_); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27025,80 +27118,80 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality _media_metadata_unref0 (metadata); #line 3755 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27026 "Photo.c" +#line 27119 "Photo.c" } #line 3666 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp86_); + _photo_file_adapter_unref0 (_tmp58_); #line 3666 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (pixbuf); #line 3666 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (writer); #line 3666 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (metadata); -#line 27036 "Photo.c" +#line 27129 "Photo.c" } -static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* file_format, GError** error) { +static GFile* +photo_generate_new_editable_file (Photo* self, + PhotoFileFormat* file_format, + GError** error) +{ PhotoFileFormat _vala_file_format = 0; GFile* result = NULL; GFile* backing = NULL; - PhotoFileFormat _tmp4_; - gboolean _tmp5_; + PhotoFileFormat _tmp3_; gchar* name = NULL; gchar* ext = NULL; - gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; - const gchar* _tmp12_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; + gboolean _tmp8_ = FALSE; + const gchar* _tmp9_; gchar* editable_basename = NULL; - const gchar* _tmp22_; - const gchar* _tmp23_; - gchar* _tmp24_; + const gchar* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; gboolean collision = FALSE; - GFile* _tmp25_ = NULL; + GFile* _tmp21_ = NULL; + GFile* _tmp22_; + GFile* _tmp23_; + gboolean _tmp24_ = FALSE; + GFile* _tmp25_; GFile* _tmp26_; GFile* _tmp27_; - gboolean _tmp28_ = FALSE; - GFile* _tmp29_; - GFile* _tmp30_; - GFile* _tmp31_; GError * _inner_error_ = NULL; #line 3758 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); -#line 27069 "Photo.c" +#line 27165 "Photo.c" { PhotoRow* _tmp0_; #line 3760 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->row; #line 3760 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 27076 "Photo.c" +#line 27172 "Photo.c" { - PhotoFileFormat _tmp1_; - GFile* _tmp2_; -#line 3761 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_file_format (self); + GFile* _tmp1_; #line 3761 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_file_format = _tmp1_; + _vala_file_format = photo_get_file_format (self); #line 3762 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 3762 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (backing); #line 3762 "/home/jens/Source/shotwell/src/Photo.vala" - backing = _tmp2_; -#line 27090 "Photo.c" + backing = _tmp1_; +#line 27183 "Photo.c" } __finally399: { - PhotoRow* _tmp3_; + PhotoRow* _tmp2_; #line 3760 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->row; + _tmp2_ = self->row; #line 3760 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 27099 "Photo.c" +#line 27192 "Photo.c" } #line 3760 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -27108,113 +27201,104 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi _g_object_unref0 (backing); #line 3760 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 27109 "Photo.c" +#line 27202 "Photo.c" } } #line 3765 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _vala_file_format; -#line 3765 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_file_format_can_write (_tmp4_); + _tmp3_ = _vala_file_format; #line 3765 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp5_) { -#line 27118 "Photo.c" - PhotoFileFormat _tmp6_; -#line 3766 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_format_get_system_default_format (); + if (!photo_file_format_can_write (_tmp3_)) { #line 3766 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_file_format = _tmp6_; -#line 27124 "Photo.c" + _vala_file_format = photo_file_format_get_system_default_format (); +#line 27211 "Photo.c" } #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = g_file_get_basename (backing); + _tmp4_ = g_file_get_basename (backing); #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" - disassemble_filename (_tmp8_, &_tmp9_, &_tmp10_); + disassemble_filename (_tmp5_, &_tmp6_, &_tmp7_); #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" - name = _tmp9_; + name = _tmp6_; #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" - ext = _tmp10_; + ext = _tmp7_; #line 3769 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp5_); #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = ext; + _tmp9_ = ext; #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_ == NULL) { + if (_tmp9_ == NULL) { #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = TRUE; -#line 27148 "Photo.c" + _tmp8_ = TRUE; +#line 27235 "Photo.c" } else { - PhotoFileFormat _tmp13_; - PhotoFileFormatProperties* _tmp14_; - PhotoFileFormatProperties* _tmp15_; - const gchar* _tmp16_; - gboolean _tmp17_; + PhotoFileFormat _tmp10_; + PhotoFileFormatProperties* _tmp11_; + PhotoFileFormatProperties* _tmp12_; + const gchar* _tmp13_; #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _vala_file_format; + _tmp10_ = _vala_file_format; #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo_file_format_get_properties (_tmp13_); + _tmp11_ = photo_file_format_get_properties (_tmp10_); #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = ext; + _tmp13_ = ext; #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_file_format_properties_is_recognized_extension (_tmp15_, _tmp16_); + _tmp8_ = !photo_file_format_properties_is_recognized_extension (_tmp12_, _tmp13_); #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = !_tmp17_; -#line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_format_properties_unref0 (_tmp15_); -#line 27169 "Photo.c" + _photo_file_format_properties_unref0 (_tmp12_); +#line 27253 "Photo.c" } #line 3771 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { -#line 27173 "Photo.c" - PhotoFileFormat _tmp18_; - PhotoFileFormatProperties* _tmp19_; - PhotoFileFormatProperties* _tmp20_; - gchar* _tmp21_; + if (_tmp8_) { +#line 27257 "Photo.c" + PhotoFileFormat _tmp14_; + PhotoFileFormatProperties* _tmp15_; + PhotoFileFormatProperties* _tmp16_; + gchar* _tmp17_; #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _vala_file_format; + _tmp14_ = _vala_file_format; #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = photo_file_format_get_properties (_tmp18_); + _tmp15_ = photo_file_format_get_properties (_tmp14_); #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_file_format_properties_get_default_extension (_tmp20_); + _tmp17_ = photo_file_format_properties_get_default_extension (_tmp16_); #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (ext); #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" - ext = _tmp21_; + ext = _tmp17_; #line 3772 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_format_properties_unref0 (_tmp20_); -#line 27192 "Photo.c" + _photo_file_format_properties_unref0 (_tmp16_); +#line 27276 "Photo.c" } #line 3774 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = name; + _tmp18_ = name; #line 3774 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = ext; + _tmp19_ = ext; #line 3774 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = g_strdup_printf ("%s_%s.%s", _tmp22_, _ ("modified"), _tmp23_); + _tmp20_ = g_strdup_printf ("%s_%s.%s", _tmp18_, _ ("modified"), _tmp19_); #line 3774 "/home/jens/Source/shotwell/src/Photo.vala" - editable_basename = _tmp24_; + editable_basename = _tmp20_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = g_file_get_parent (backing); + _tmp22_ = g_file_get_parent (backing); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_; + _tmp23_ = _tmp22_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = generate_unique_file (_tmp27_, editable_basename, &_tmp28_, &_inner_error_); + _tmp25_ = generate_unique_file (_tmp23_, editable_basename, &_tmp24_, &_inner_error_); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - collision = _tmp28_; + collision = _tmp24_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _tmp29_; + _tmp26_ = _tmp25_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp23_); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp30_; + _tmp21_ = _tmp26_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27229,16 +27313,16 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi _g_object_unref0 (backing); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 27230 "Photo.c" +#line 27314 "Photo.c" } #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp25_; + _tmp27_ = _tmp21_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = NULL; + _tmp21_ = NULL; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp31_; + result = _tmp27_; #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp21_); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (editable_basename); #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27251,115 +27335,113 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi if (file_format) { #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" *file_format = _vala_file_format; -#line 27252 "Photo.c" +#line 27336 "Photo.c" } #line 3777 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27256 "Photo.c" +#line 27340 "Photo.c" } -static void _g_object_unref0_ (gpointer var) { +static void +_g_object_unref0_ (gpointer var) +{ #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 27263 "Photo.c" +#line 27349 "Photo.c" } -static void _g_list_free__g_object_unref0_ (GList* self) { +static inline void +_g_list_free__g_object_unref0_ (GList* self) +{ #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - g_list_free (self); -#line 27272 "Photo.c" + g_list_free_full (self, (GDestroyNotify) _g_object_unref0_); +#line 27358 "Photo.c" } -static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, GError** error) { +static gboolean +photo_launch_editor (GFile* file, + PhotoFileFormat file_format, + GError** error) +{ gboolean result = FALSE; gchar* _tmp0_ = NULL; - PhotoFileFormat _tmp1_; gchar* commandline = NULL; - gchar* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; + gchar* _tmp7_; + const gchar* _tmp8_; GAppInfo* app = NULL; GList* files = NULL; - GFile* _tmp16_; - GFile* _tmp17_; - GAppInfo* _tmp18_; + GFile* _tmp14_; + GAppInfo* _tmp15_; gchar** argv = NULL; - gchar** _tmp24_; + gchar** _tmp20_; gint argv_length1; gint _argv_size_; + gchar** _tmp21_; + gint _tmp21__length1; + const gchar* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; gchar** _tmp25_; gint _tmp25__length1; - const gchar* _tmp26_; + gchar* _tmp26_; gchar* _tmp27_; - gchar* _tmp28_; + GPid child_pid = 0; + gboolean _tmp28_ = FALSE; gchar** _tmp29_; gint _tmp29__length1; - GFile* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - GPid child_pid = 0; - gboolean _tmp33_ = FALSE; - gchar** _tmp34_; - gint _tmp34__length1; - GPid _tmp35_ = 0; - gboolean _tmp36_; + GPid _tmp30_ = 0; + gboolean _tmp31_; GError * _inner_error_ = NULL; #line 3780 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file_format; -#line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) { -#line 27316 "Photo.c" + if (file_format == PHOTO_FILE_FORMAT_RAW) { +#line 27400 "Photo.c" + ConfigFacade* _tmp1_; ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - gchar* _tmp4_; + gchar* _tmp3_; #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = config_facade_get_instance (); + _tmp1_ = config_facade_get_instance (); #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp3_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); -#line 27332 "Photo.c" + _g_object_unref0 (_tmp2_); +#line 27416 "Photo.c" } else { + ConfigFacade* _tmp4_; ConfigFacade* _tmp5_; - ConfigFacade* _tmp6_; - gchar* _tmp7_; + gchar* _tmp6_; #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = config_facade_get_instance (); + _tmp4_ = config_facade_get_instance (); #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp6_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp7_; + _tmp0_ = _tmp6_; #line 3782 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp6_); -#line 27349 "Photo.c" + _g_object_unref0 (_tmp5_); +#line 27433 "Photo.c" } #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_strdup (_tmp0_); + _tmp7_ = g_strdup (_tmp0_); #line 3781 "/home/jens/Source/shotwell/src/Photo.vala" - commandline = _tmp8_; -#line 3784 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = commandline; + commandline = _tmp7_; #line 3784 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = is_string_empty (_tmp9_); + _tmp8_ = commandline; #line 3784 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_) { + if (is_string_empty (_tmp8_)) { #line 3785 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 3785 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27368,35 +27450,35 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G _g_free0 (_tmp0_); #line 3785 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27369 "Photo.c" +#line 27451 "Photo.c" } { - GAppInfo* _tmp11_ = NULL; - const gchar* _tmp12_; - GAppInfo* _tmp13_; - GAppInfo* _tmp14_; + GAppInfo* _tmp9_ = NULL; + const gchar* _tmp10_; + GAppInfo* _tmp11_; + GAppInfo* _tmp12_; #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = commandline; + _tmp10_ = commandline; #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = g_app_info_create_from_commandline (_tmp12_, "", G_APP_INFO_CREATE_NONE, &_inner_error_); + _tmp11_ = g_app_info_create_from_commandline (_tmp10_, "", G_APP_INFO_CREATE_NONE, &_inner_error_); #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp13_; + _tmp9_ = _tmp11_; #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27384 "Photo.c" +#line 27466 "Photo.c" goto __catch400_g_error; } #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp11_; + _tmp12_ = _tmp9_; #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = NULL; + _tmp9_ = NULL; #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (app); #line 3789 "/home/jens/Source/shotwell/src/Photo.vala" - app = _tmp14_; + app = _tmp12_; #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp11_); -#line 27397 "Photo.c" + _g_object_unref0 (_tmp9_); +#line 27479 "Photo.c" } goto __finally400; __catch400_g_error: @@ -27412,13 +27494,13 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G app = NULL; #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (er); -#line 27413 "Photo.c" +#line 27495 "Photo.c" } __finally400: #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27418 "Photo.c" - gboolean _tmp15_ = FALSE; +#line 27500 "Photo.c" + gboolean _tmp13_ = FALSE; #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27428,38 +27510,33 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 3788 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp15_; -#line 27430 "Photo.c" + return _tmp13_; +#line 27512 "Photo.c" } #line 3795 "/home/jens/Source/shotwell/src/Photo.vala" files = NULL; #line 3796 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = file; -#line 3796 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _g_object_ref0 (_tmp16_); + _tmp14_ = _g_object_ref0 (file); #line 3796 "/home/jens/Source/shotwell/src/Photo.vala" - files = g_list_insert (files, _tmp17_, -1); + files = g_list_insert (files, _tmp14_, -1); #line 3798 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = app; + _tmp15_ = app; #line 3798 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_ != NULL) { -#line 27444 "Photo.c" - gboolean _tmp19_ = FALSE; - GAppInfo* _tmp20_; - GList* _tmp21_; - gboolean _tmp22_; -#line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = app; + if (_tmp15_ != NULL) { +#line 27524 "Photo.c" + gboolean _tmp16_ = FALSE; + GAppInfo* _tmp17_; + GList* _tmp18_; #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = files; + _tmp17_ = app; #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = g_app_info_launch (_tmp20_, _tmp21_, NULL, &_inner_error_); + _tmp18_ = files; #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp22_; + _tmp16_ = g_app_info_launch (_tmp17_, _tmp18_, NULL, &_inner_error_); #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27459 "Photo.c" - gboolean _tmp23_ = FALSE; +#line 27536 "Photo.c" + gboolean _tmp19_ = FALSE; #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27471,11 +27548,11 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp23_; -#line 27473 "Photo.c" + return _tmp19_; +#line 27550 "Photo.c" } #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp19_; + result = _tmp16_; #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" __g_list_free__g_object_unref0_0 (files); #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27486,58 +27563,56 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G _g_free0 (_tmp0_); #line 3799 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27487 "Photo.c" +#line 27564 "Photo.c" } #line 3801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = g_new0 (gchar*, 2 + 1); + _tmp20_ = g_new0 (gchar*, 2 + 1); #line 3801 "/home/jens/Source/shotwell/src/Photo.vala" - argv = _tmp24_; + argv = _tmp20_; #line 3801 "/home/jens/Source/shotwell/src/Photo.vala" argv_length1 = 2; #line 3801 "/home/jens/Source/shotwell/src/Photo.vala" _argv_size_ = argv_length1; #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = argv; + _tmp21_ = argv; #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25__length1 = argv_length1; + _tmp21__length1 = argv_length1; #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = commandline; + _tmp22_ = commandline; #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = g_strdup (_tmp26_); + _tmp23_ = g_strdup (_tmp22_); #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp25_[0]); + _g_free0 (_tmp21_[0]); #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_[0] = _tmp27_; + _tmp21_[0] = _tmp23_; #line 3802 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp25_[0]; -#line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = argv; + _tmp24_ = _tmp21_[0]; #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29__length1 = argv_length1; + _tmp25_ = argv; #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = file; + _tmp25__length1 = argv_length1; #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = g_file_get_path (_tmp30_); + _tmp26_ = g_file_get_path (file); #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp29_[1]); + _g_free0 (_tmp25_[1]); #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_[1] = _tmp31_; + _tmp25_[1] = _tmp26_; #line 3803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp29_[1]; + _tmp27_ = _tmp25_[1]; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = argv; + _tmp29_ = argv; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34__length1 = argv_length1; + _tmp29__length1 = argv_length1; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = g_spawn_async ("/", _tmp34_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp35_, &_inner_error_); + _tmp31_ = g_spawn_async ("/", _tmp29_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp30_, &_inner_error_); #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - child_pid = _tmp35_; + child_pid = _tmp30_; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp36_; + _tmp28_ = _tmp31_; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27537 "Photo.c" - gboolean _tmp37_ = FALSE; +#line 27612 "Photo.c" + gboolean _tmp32_ = FALSE; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27551,11 +27626,11 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp0_); #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp37_; -#line 27553 "Photo.c" + return _tmp32_; +#line 27628 "Photo.c" } #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp33_; + result = _tmp28_; #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27568,14 +27643,16 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G _g_free0 (_tmp0_); #line 3807 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 27569 "Photo.c" +#line 27644 "Photo.c" } -void photo_open_with_raw_external_editor (Photo* self, GError** error) { +void +photo_open_with_raw_external_editor (Photo* self, + GError** error) +{ GFile* _tmp0_; GFile* _tmp1_; - PhotoFileFormat _tmp2_; GError * _inner_error_ = NULL; #line 3817 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -27584,9 +27661,7 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error) { #line 3818 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 3818 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_get_master_file_format (self); -#line 3818 "/home/jens/Source/shotwell/src/Photo.vala" - photo_launch_editor (_tmp1_, _tmp2_, &_inner_error_); + photo_launch_editor (_tmp1_, photo_get_master_file_format (self), &_inner_error_); #line 3818 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp1_); #line 3818 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27595,24 +27670,26 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 3818 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27596 "Photo.c" +#line 27671 "Photo.c" } } -void photo_open_with_external_editor (Photo* self, GError** error) { +void +photo_open_with_external_editor (Photo* self, + GError** error) +{ GFile* current_editable_file = NULL; GFile* create_editable_file = NULL; PhotoFileFormat editable_file_format = 0; + gboolean _tmp14_ = FALSE; gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; - GFile* _tmp17_; - gboolean _tmp25_ = FALSE; - GFile* _tmp26_; - GFile* _tmp44_; - GFileMonitor* _tmp45_; - GFile* _tmp47_; - PhotoFileFormat _tmp48_; + GFile* _tmp16_; + gboolean _tmp22_ = FALSE; + GFile* _tmp23_; + GFile* _tmp40_; + GFileMonitor* _tmp41_; + GFile* _tmp43_; GError * _inner_error_ = NULL; #line 3822 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -27620,14 +27697,14 @@ void photo_open_with_external_editor (Photo* self, GError** error) { current_editable_file = NULL; #line 3824 "/home/jens/Source/shotwell/src/Photo.vala" create_editable_file = NULL; -#line 27621 "Photo.c" +#line 27698 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 3826 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 3826 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 27628 "Photo.c" +#line 27705 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -27638,7 +27715,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _tmp2_ = _tmp1_->editable; #line 3827 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 27639 "Photo.c" +#line 27716 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; GFile* _tmp5_; @@ -27652,13 +27729,13 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3828 "/home/jens/Source/shotwell/src/Photo.vala" current_editable_file = _tmp5_; -#line 27653 "Photo.c" +#line 27730 "Photo.c" } #line 3830 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = current_editable_file; #line 3830 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp6_ == NULL) { -#line 27659 "Photo.c" +#line 27736 "Photo.c" GFile* _tmp7_ = NULL; PhotoFileFormat _tmp8_ = 0; GFile* _tmp9_; @@ -27671,7 +27748,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _tmp7_ = _tmp9_; #line 3831 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27672 "Photo.c" +#line 27749 "Photo.c" goto __finally401; } #line 3831 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27684,30 +27761,27 @@ void photo_open_with_external_editor (Photo* self, GError** error) { create_editable_file = _tmp10_; #line 3830 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp7_); -#line 27685 "Photo.c" +#line 27762 "Photo.c" } else { PhotoBackingReaders* _tmp11_; PhotoFileReader* _tmp12_; - PhotoFileFormat _tmp13_; #line 3833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = self->priv->readers; #line 3833 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tmp11_->editable; #line 3833 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 3833 "/home/jens/Source/shotwell/src/Photo.vala" - editable_file_format = _tmp13_; -#line 27698 "Photo.c" + editable_file_format = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); +#line 27772 "Photo.c" } } __finally401: { - PhotoBackingReaders* _tmp14_; + PhotoBackingReaders* _tmp13_; #line 3826 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = self->priv->readers; + _tmp13_ = self->priv->readers; #line 3826 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 27708 "Photo.c" +#line 27782 "Photo.c" } #line 3826 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -27719,115 +27793,106 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3826 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27720 "Photo.c" +#line 27794 "Photo.c" } } #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = create_editable_file; + _tmp16_ = create_editable_file; #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_ == NULL) { -#line 27727 "Photo.c" - GFile* _tmp18_; + if (_tmp16_ == NULL) { +#line 27801 "Photo.c" + GFile* _tmp17_; #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = current_editable_file; + _tmp17_ = current_editable_file; #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp18_ != NULL; -#line 27733 "Photo.c" + _tmp15_ = _tmp17_ != NULL; +#line 27807 "Photo.c" } else { #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = FALSE; -#line 27737 "Photo.c" + _tmp15_ = FALSE; +#line 27811 "Photo.c" } #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp16_) { -#line 27741 "Photo.c" - gboolean _tmp19_ = FALSE; - GFile* _tmp20_; - gboolean _tmp21_; -#line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = current_editable_file; + if (_tmp15_) { +#line 27815 "Photo.c" + gboolean _tmp18_ = FALSE; + GFile* _tmp19_; #line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = g_file_query_exists (_tmp20_, NULL); + _tmp19_ = current_editable_file; #line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp21_) { + if (!g_file_query_exists (_tmp19_, NULL)) { #line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = TRUE; -#line 27753 "Photo.c" + _tmp18_ = TRUE; +#line 27824 "Photo.c" } else { - gboolean _tmp22_; #line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo_has_transformations (self); -#line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp22_; -#line 27760 "Photo.c" + _tmp18_ = photo_has_transformations (self); +#line 27828 "Photo.c" } #line 3839 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp19_; -#line 27764 "Photo.c" + _tmp14_ = _tmp18_; +#line 27832 "Photo.c" } else { #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = FALSE; -#line 27768 "Photo.c" + _tmp14_ = FALSE; +#line 27836 "Photo.c" } #line 3838 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_) { -#line 27772 "Photo.c" - GFile* _tmp23_; - GFile* _tmp24_; + if (_tmp14_) { +#line 27840 "Photo.c" + GFile* _tmp20_; + GFile* _tmp21_; #line 3840 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = current_editable_file; + _tmp20_ = current_editable_file; #line 3840 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _g_object_ref0 (_tmp23_); + _tmp21_ = _g_object_ref0 (_tmp20_); #line 3840 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); #line 3840 "/home/jens/Source/shotwell/src/Photo.vala" - create_editable_file = _tmp24_; -#line 27783 "Photo.c" + create_editable_file = _tmp21_; +#line 27851 "Photo.c" } #line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = create_editable_file; + _tmp23_ = create_editable_file; #line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp26_ != NULL) { -#line 27789 "Photo.c" - PhotoFileFormat _tmp27_; - gboolean _tmp28_; -#line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = editable_file_format; + if (_tmp23_ != NULL) { +#line 27857 "Photo.c" + PhotoFileFormat _tmp24_; #line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = photo_file_format_can_write (_tmp27_); + _tmp24_ = editable_file_format; #line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp28_; -#line 27798 "Photo.c" + _tmp22_ = photo_file_format_can_write (_tmp24_); +#line 27863 "Photo.c" } else { #line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = FALSE; -#line 27802 "Photo.c" + _tmp22_ = FALSE; +#line 27867 "Photo.c" } #line 3843 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp25_) { -#line 27806 "Photo.c" - PhotoFileFormat _tmp40_; - GFile* _tmp41_; - GFile* _tmp42_; - GFile* _tmp43_; + if (_tmp22_) { +#line 27871 "Photo.c" + PhotoFileFormat _tmp36_; + GFile* _tmp37_; + GFile* _tmp38_; + GFile* _tmp39_; #line 3844 "/home/jens/Source/shotwell/src/Photo.vala" photo_halt_monitoring_editable (self); -#line 27813 "Photo.c" +#line 27878 "Photo.c" { - GFile* _tmp29_; - Scaling _tmp30_ = {0}; - PhotoFileFormat _tmp31_; + GFile* _tmp25_; + Scaling _tmp26_ = {0}; + PhotoFileFormat _tmp27_; #line 3847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = create_editable_file; + _tmp25_ = create_editable_file; #line 3847 "/home/jens/Source/shotwell/src/Photo.vala" - scaling_for_original (&_tmp30_); + scaling_for_original (&_tmp26_); #line 3847 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = editable_file_format; + _tmp27_ = editable_file_format; #line 3847 "/home/jens/Source/shotwell/src/Photo.vala" - photo_export (self, _tmp29_, &_tmp30_, JPEG_QUALITY_MAXIMUM, _tmp31_, FALSE, TRUE, &_inner_error_); + photo_export (self, _tmp25_, &_tmp26_, JPEG_QUALITY_MAXIMUM, _tmp27_, FALSE, TRUE, &_inner_error_); #line 3847 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27828 "Photo.c" +#line 27893 "Photo.c" goto __catch402_g_error; } } @@ -27835,22 +27900,22 @@ void photo_open_with_external_editor (Photo* self, GError** error) { __catch402_g_error: { GError* err = NULL; - GError* _tmp38_; - GError* _tmp39_; + GError* _tmp34_; + GError* _tmp35_; #line 3846 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 3846 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; -#line 27842 "Photo.c" +#line 27907 "Photo.c" { - GFile* _tmp32_; + GFile* _tmp28_; #line 3852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = create_editable_file; + _tmp28_ = create_editable_file; #line 3852 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_delete (_tmp32_, NULL, &_inner_error_); + g_file_delete (_tmp28_, NULL, &_inner_error_); #line 3852 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 27851 "Photo.c" +#line 27916 "Photo.c" goto __catch403_g_error; } } @@ -27858,33 +27923,33 @@ void photo_open_with_external_editor (Photo* self, GError** error) { __catch403_g_error: { GError* delete_err = NULL; - GFile* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - GError* _tmp36_; - const gchar* _tmp37_; + GFile* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + GError* _tmp32_; + const gchar* _tmp33_; #line 3851 "/home/jens/Source/shotwell/src/Photo.vala" delete_err = _inner_error_; #line 3851 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = create_editable_file; + _tmp29_ = create_editable_file; #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = g_file_get_path (_tmp33_); + _tmp30_ = g_file_get_path (_tmp29_); #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_; + _tmp31_ = _tmp30_; #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = delete_err; + _tmp32_ = delete_err; #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_->message; + _tmp33_ = _tmp32_->message; #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" g_warning ("Photo.vala:3855: Unable to delete editable file %s after export error:" \ -" %s", _tmp35_, _tmp37_); +" %s", _tmp31_, _tmp33_); #line 3855 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp31_); #line 3851 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (delete_err); -#line 27884 "Photo.c" +#line 27949 "Photo.c" } __finally403: #line 3851 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27903,17 +27968,17 @@ void photo_open_with_external_editor (Photo* self, GError** error) { g_clear_error (&_inner_error_); #line 3851 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27903 "Photo.c" +#line 27968 "Photo.c" } #line 3859 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = err; + _tmp34_ = err; #line 3859 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _g_error_copy0 (_tmp38_); + _tmp35_ = _g_error_copy0 (_tmp34_); #line 3859 "/home/jens/Source/shotwell/src/Photo.vala" - _inner_error_ = _tmp39_; + _inner_error_ = _tmp35_; #line 3859 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 27913 "Photo.c" +#line 27978 "Photo.c" goto __finally402; } __finally402: @@ -27927,14 +27992,14 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3846 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27927 "Photo.c" +#line 27992 "Photo.c" } #line 3863 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = editable_file_format; + _tmp36_ = editable_file_format; #line 3863 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = create_editable_file; + _tmp37_ = create_editable_file; #line 3863 "/home/jens/Source/shotwell/src/Photo.vala" - photo_attach_editable (self, _tmp40_, _tmp41_, &_inner_error_); + photo_attach_editable (self, _tmp36_, _tmp37_, &_inner_error_); #line 3863 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3863 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27945,32 +28010,32 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3863 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27945 "Photo.c" +#line 28010 "Photo.c" } #line 3865 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = create_editable_file; + _tmp38_ = create_editable_file; #line 3865 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _g_object_ref0 (_tmp42_); + _tmp39_ = _g_object_ref0 (_tmp38_); #line 3865 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); #line 3865 "/home/jens/Source/shotwell/src/Photo.vala" - current_editable_file = _tmp43_; -#line 27955 "Photo.c" + current_editable_file = _tmp39_; +#line 28020 "Photo.c" } #line 3868 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = current_editable_file; + _tmp40_ = current_editable_file; #line 3868 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp44_ != NULL, "current_editable_file != null"); + _vala_assert (_tmp40_ != NULL, "current_editable_file != null"); #line 3871 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = self->priv->editable_monitor; + _tmp41_ = self->priv->editable_monitor; #line 3871 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp45_ == NULL) { -#line 27965 "Photo.c" - GFile* _tmp46_; + if (_tmp41_ == NULL) { +#line 28030 "Photo.c" + GFile* _tmp42_; #line 3872 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = current_editable_file; + _tmp42_ = current_editable_file; #line 3872 "/home/jens/Source/shotwell/src/Photo.vala" - photo_start_monitoring_editable (self, _tmp46_, &_inner_error_); + photo_start_monitoring_editable (self, _tmp42_, &_inner_error_); #line 3872 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3872 "/home/jens/Source/shotwell/src/Photo.vala" @@ -27981,15 +28046,13 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3872 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 27981 "Photo.c" +#line 28046 "Photo.c" } } #line 3874 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = current_editable_file; -#line 3874 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = photo_get_file_format (self); + _tmp43_ = current_editable_file; #line 3874 "/home/jens/Source/shotwell/src/Photo.vala" - photo_launch_editor (_tmp47_, _tmp48_, &_inner_error_); + photo_launch_editor (_tmp43_, photo_get_file_format (self), &_inner_error_); #line 3874 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3874 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28000,42 +28063,50 @@ void photo_open_with_external_editor (Photo* self, GError** error) { _g_object_unref0 (current_editable_file); #line 3874 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28000 "Photo.c" +#line 28063 "Photo.c" } #line 3822 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (create_editable_file); #line 3822 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (current_editable_file); -#line 28006 "Photo.c" +#line 28069 "Photo.c" } -void photo_revert_to_master (Photo* self, gboolean notify) { - gboolean _tmp0_; +void +photo_revert_to_master (Photo* self, + gboolean notify) +{ #line 3877 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 3878 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = notify; -#line 3878 "/home/jens/Source/shotwell/src/Photo.vala" - photo_detach_editable (self, TRUE, TRUE, _tmp0_); -#line 28018 "Photo.c" + photo_detach_editable (self, TRUE, TRUE, notify); +#line 28081 "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) { +static void +_photo_on_editable_file_changed_g_file_monitor_changed (GFileMonitor* _sender, + GFile* file, + GFile* other_file, + GFileMonitorEvent event_type, + gpointer self) +{ #line 3888 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_editable_file_changed ((Photo*) self, file, other_file, event_type); -#line 28025 "Photo.c" +#line 28094 "Photo.c" } -static void photo_start_monitoring_editable (Photo* self, GFile* file, GError** error) { - GFile* _tmp0_; - GFileMonitor* _tmp1_ = NULL; - GFile* _tmp2_; +static void +photo_start_monitoring_editable (Photo* self, + GFile* file, + GError** error) +{ + GFileMonitor* _tmp0_ = NULL; + GFileMonitor* _tmp1_; + GFileMonitor* _tmp2_; GFileMonitor* _tmp3_; - GFileMonitor* _tmp4_; - GFileMonitor* _tmp5_; GError * _inner_error_ = NULL; #line 3881 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -28044,42 +28115,40 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError** #line 3882 "/home/jens/Source/shotwell/src/Photo.vala" photo_halt_monitoring_editable (self); #line 3885 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 3885 "/home/jens/Source/shotwell/src/Photo.vala" - library_monitor_blacklist_file (_tmp0_, "Photo.start_monitoring_editable"); -#line 3887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = file; + library_monitor_blacklist_file (file, "Photo.start_monitoring_editable"); #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = g_file_monitor (_tmp2_, G_FILE_MONITOR_NONE, NULL, &_inner_error_); + _tmp1_ = g_file_monitor (file, G_FILE_MONITOR_NONE, NULL, &_inner_error_); #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp3_; + _tmp0_ = _tmp1_; #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28059 "Photo.c" +#line 28126 "Photo.c" } #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp1_; + _tmp2_ = _tmp0_; #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = NULL; + _tmp0_ = NULL; #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->editable_monitor); #line 3887 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->editable_monitor = _tmp4_; + self->priv->editable_monitor = _tmp2_; #line 3888 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = self->priv->editable_monitor; + _tmp3_ = self->priv->editable_monitor; #line 3888 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_connect_object (_tmp5_, "changed", (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self, 0); + g_signal_connect_object (_tmp3_, "changed", (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self, 0); #line 3881 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp1_); -#line 28075 "Photo.c" + _g_object_unref0 (_tmp0_); +#line 28142 "Photo.c" } -static void photo_halt_monitoring_editable (Photo* self) { +static void +photo_halt_monitoring_editable (Photo* self) +{ GFileMonitor* _tmp0_; GFile* file = NULL; GFile* _tmp1_; @@ -28095,7 +28164,7 @@ static void photo_halt_monitoring_editable (Photo* self) { if (_tmp0_ == NULL) { #line 3893 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28095 "Photo.c" +#line 28164 "Photo.c" } #line 3896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = photo_get_editable_file (self); @@ -28105,13 +28174,13 @@ static void photo_halt_monitoring_editable (Photo* self) { _tmp2_ = file; #line 3897 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 28105 "Photo.c" +#line 28174 "Photo.c" GFile* _tmp3_; #line 3898 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = file; #line 3898 "/home/jens/Source/shotwell/src/Photo.vala" library_monitor_unblacklist_file (_tmp3_); -#line 28111 "Photo.c" +#line 28180 "Photo.c" } #line 3900 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = self->priv->editable_monitor; @@ -28129,17 +28198,20 @@ static void photo_halt_monitoring_editable (Photo* self) { self->priv->editable_monitor = NULL; #line 3891 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); -#line 28129 "Photo.c" +#line 28198 "Photo.c" } -static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFile* file, GError** error) { - PhotoFileFormat _tmp0_; - GFile* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - PhotoFileReader* _tmp4_; - PhotoFileReader* _tmp5_; +static void +photo_attach_editable (Photo* self, + PhotoFileFormat file_format, + GFile* file, + GError** error) +{ + gchar* _tmp0_; + gchar* _tmp1_; + PhotoFileReader* _tmp2_; + PhotoFileReader* _tmp3_; GError * _inner_error_ = NULL; #line 3905 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -28148,35 +28220,34 @@ static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFi #line 3910 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file_format; + _tmp0_ = g_file_get_path (file); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file; + _tmp1_ = _tmp0_; #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = g_file_get_path (_tmp1_); + _tmp2_ = photo_file_format_create_reader (file_format, _tmp1_); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = _tmp2_; #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_file_format_create_reader (_tmp0_, _tmp3_); -#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; -#line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - photo_update_editable (self, FALSE, _tmp5_, &_inner_error_); + photo_update_editable (self, FALSE, _tmp3_, &_inner_error_); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp5_); + _photo_file_adapter_unref0 (_tmp3_); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp1_); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 3911 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28171 "Photo.c" +#line 28239 "Photo.c" } } -static void photo_update_editable_attributes (Photo* self, GError** error) { +static void +photo_update_editable_attributes (Photo* self, + GError** error) +{ GError * _inner_error_ = NULL; #line 3914 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -28188,12 +28259,15 @@ static void photo_update_editable_attributes (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 3915 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28188 "Photo.c" +#line 28259 "Photo.c" } } -void photo_reimport_editable (Photo* self, GError** error) { +void +photo_reimport_editable (Photo* self, + GError** error) +{ GError * _inner_error_ = NULL; #line 3918 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -28205,213 +28279,231 @@ void photo_reimport_editable (Photo* self, GError** error) { g_propagate_error (error, _inner_error_); #line 3919 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28205 "Photo.c" +#line 28279 "Photo.c" } } -static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add107 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28217 "Photo.c" +#line 28296 "Photo.c" } #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28223 "Photo.c" +#line 28302 "Photo.c" } -static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add108 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28234 "Photo.c" +#line 28318 "Photo.c" } #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28240 "Photo.c" +#line 28324 "Photo.c" } -static void _vala_array_add109 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add109 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28251 "Photo.c" +#line 28340 "Photo.c" } #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28257 "Photo.c" +#line 28346 "Photo.c" } -static void _vala_array_add110 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add110 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28268 "Photo.c" +#line 28362 "Photo.c" } #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28274 "Photo.c" +#line 28368 "Photo.c" } -static void _vala_array_add111 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add111 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28285 "Photo.c" +#line 28384 "Photo.c" } #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28291 "Photo.c" +#line 28390 "Photo.c" } -static void _vala_array_add112 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add112 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" if ((*length) == (*size)) { #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" *size = (*size) ? (2 * (*size)) : 4; #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 28302 "Photo.c" +#line 28406 "Photo.c" } #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[(*length)++] = value; #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" (*array)[*length] = NULL; -#line 28308 "Photo.c" +#line 28412 "Photo.c" } -static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoFileReader* new_reader, GError** error) { +static void +photo_update_editable (Photo* self, + gboolean only_attributes, + PhotoFileReader* new_reader, + GError** error) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_; PhotoFileReader* old_reader = NULL; - PhotoFileReader* _tmp5_; - PhotoFileReader* _tmp6_ = NULL; - PhotoFileReader* _tmp7_; + PhotoFileReader* _tmp2_; + PhotoFileReader* _tmp3_ = NULL; PhotoFileReader* reader = NULL; - PhotoFileReader* _tmp9_; - PhotoFileReader* _tmp10_; + PhotoFileReader* _tmp5_; + PhotoFileReader* _tmp6_; gboolean timestamp_changed = FALSE; gboolean filesize_changed = FALSE; gboolean is_new_editable = FALSE; BackingPhotoID editable_id = {0}; - BackingPhotoID _tmp11_ = {0}; + BackingPhotoID _tmp7_ = {0}; GFile* file = NULL; - PhotoFileReader* _tmp12_; - GFile* _tmp13_; + PhotoFileReader* _tmp8_; + GFile* _tmp9_; DetectedPhotoInformation* detected = NULL; BackingPhotoRow* backing = NULL; - GFile* _tmp14_; - DetectedPhotoInformation* _tmp15_ = NULL; - BackingPhotoRow* _tmp16_; - gboolean _tmp17_; - gboolean _tmp35_; - PhotoFileReader* _tmp94_; - gboolean _tmp100_ = FALSE; - gboolean _tmp101_; + GFile* _tmp10_; + DetectedPhotoInformation* _tmp11_ = NULL; + BackingPhotoRow* _tmp12_; + gboolean _tmp87_ = FALSE; gchar** alteration_list = NULL; - gchar** _tmp112_; + gchar** _tmp96_; gint alteration_list_length1; gint _alteration_list_size_; - gboolean _tmp113_; - gboolean _tmp121_ = FALSE; - gboolean _tmp122_; - gchar** _tmp131_; - gint _tmp131__length1; + gboolean _tmp97_; + gboolean _tmp104_ = FALSE; + gboolean _tmp105_; + gchar** _tmp112_; + gint _tmp112__length1; GError * _inner_error_ = NULL; #line 3924 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 3924 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_reader == NULL) || IS_PHOTO_FILE_READER (new_reader)); #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = only_attributes; -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_) { -#line 28359 "Photo.c" - PhotoFileReader* _tmp3_; -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = new_reader; + if (only_attributes) { #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp3_ == NULL; -#line 28365 "Photo.c" + _tmp1_ = new_reader == NULL; +#line 28462 "Photo.c" } else { #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = FALSE; -#line 28369 "Photo.c" +#line 28466 "Photo.c" } #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp1_) { #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 28375 "Photo.c" +#line 28472 "Photo.c" } else { - gboolean _tmp4_; #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = only_attributes; -#line 3926 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = !_tmp4_; -#line 28382 "Photo.c" + _tmp0_ = !only_attributes; +#line 28476 "Photo.c" } #line 3926 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp0_, "(only_attributes && new_reader == null) || (!only_attributes)"); #line 3928 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_get_editable_reader (self); + _tmp2_ = photo_get_editable_reader (self); #line 3928 "/home/jens/Source/shotwell/src/Photo.vala" - old_reader = _tmp5_; -#line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = new_reader; + old_reader = _tmp2_; #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp7_; + _tmp3_ = new_reader; #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_ == NULL) { -#line 28396 "Photo.c" - PhotoFileReader* _tmp8_; + if (_tmp3_ == NULL) { +#line 28488 "Photo.c" + PhotoFileReader* _tmp4_; #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = old_reader; + _tmp4_ = old_reader; #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp8_; -#line 28402 "Photo.c" + _tmp3_ = _tmp4_; +#line 28494 "Photo.c" } #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _photo_file_adapter_ref0 (_tmp6_); + _tmp5_ = _photo_file_adapter_ref0 (_tmp3_); #line 3930 "/home/jens/Source/shotwell/src/Photo.vala" - reader = _tmp9_; + reader = _tmp5_; #line 3931 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = reader; + _tmp6_ = reader; #line 3931 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_ == NULL) { + if (_tmp6_ == NULL) { #line 3932 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, FALSE, TRUE, TRUE); #line 3934 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28420,7 +28512,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3934 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28420 "Photo.c" +#line 28512 "Photo.c" } #line 3937 "/home/jens/Source/shotwell/src/Photo.vala" timestamp_changed = FALSE; @@ -28429,25 +28521,25 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF #line 3939 "/home/jens/Source/shotwell/src/Photo.vala" is_new_editable = FALSE; #line 3941 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_editable_id (self, &_tmp11_); + photo_get_editable_id (self, &_tmp7_); #line 3941 "/home/jens/Source/shotwell/src/Photo.vala" - editable_id = _tmp11_; + editable_id = _tmp7_; #line 3942 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = reader; + _tmp8_ = reader; #line 3942 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp9_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 3942 "/home/jens/Source/shotwell/src/Photo.vala" - file = _tmp13_; + file = _tmp9_; #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = file; + _tmp10_ = file; #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo_query_backing_photo_row (self, _tmp14_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp15_, &_inner_error_); + _tmp12_ = photo_query_backing_photo_row (self, _tmp10_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp11_, &_inner_error_); #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" - detected = _tmp15_; + detected = _tmp11_; #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" - backing = _tmp16_; + backing = _tmp12_; #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28462,32 +28554,30 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3945 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28462 "Photo.c" +#line 28554 "Photo.c" } #line 3949 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = backing_photo_id_is_invalid (&editable_id); -#line 3949 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_) { -#line 28468 "Photo.c" - BackingPhotoRow* _tmp18_; + if (backing_photo_id_is_invalid (&editable_id)) { +#line 28558 "Photo.c" + BackingPhotoRow* _tmp13_; #line 3951 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = backing; + _tmp13_ = backing; #line 3951 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_ != NULL) { -#line 28474 "Photo.c" - BackingPhotoTable* _tmp19_; - BackingPhotoTable* _tmp20_; - BackingPhotoRow* _tmp21_; + if (_tmp13_ != NULL) { +#line 28564 "Photo.c" + BackingPhotoTable* _tmp14_; + BackingPhotoTable* _tmp15_; + BackingPhotoRow* _tmp16_; #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = backing_photo_table_get_instance (); + _tmp14_ = backing_photo_table_get_instance (); #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp15_ = _tmp14_; #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = backing; + _tmp16_ = backing; #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_add (_tmp20_, _tmp21_, &_inner_error_); + backing_photo_table_add (_tmp15_, _tmp16_, &_inner_error_); #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp20_); + _database_table_unref0 (_tmp15_); #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28504,82 +28594,82 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3952 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28504 "Photo.c" +#line 28594 "Photo.c" } { - PhotoRow* _tmp22_; + PhotoRow* _tmp17_; #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = self->row; + _tmp17_ = self->row; #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28512 "Photo.c" +#line 28602 "Photo.c" { - PhotoTable* _tmp23_; - PhotoTable* _tmp24_; - PhotoRow* _tmp25_; + PhotoTable* _tmp18_; + PhotoTable* _tmp19_; + PhotoRow* _tmp20_; + BackingPhotoRow* _tmp21_; + BackingPhotoID _tmp22_; + BackingPhotoRow* _tmp23_; + BackingPhotoRow* _tmp24_; + BackingPhotoRow* _tmp25_; BackingPhotoRow* _tmp26_; - BackingPhotoID _tmp27_; - BackingPhotoRow* _tmp28_; - BackingPhotoRow* _tmp29_; - BackingPhotoRow* _tmp30_; - BackingPhotoRow* _tmp31_; - BackingPhotoRow* _tmp32_; - Orientation _tmp33_; + BackingPhotoRow* _tmp27_; + Orientation _tmp28_; #line 3954 "/home/jens/Source/shotwell/src/Photo.vala" timestamp_changed = TRUE; #line 3955 "/home/jens/Source/shotwell/src/Photo.vala" filesize_changed = TRUE; #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo_table_get_instance (); + _tmp18_ = photo_table_get_instance (); #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_; + _tmp19_ = _tmp18_; #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->row; + _tmp20_ = self->row; #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = backing; + _tmp21_ = backing; #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_->id; + _tmp22_ = _tmp21_->id; #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_attach_editable (_tmp24_, _tmp25_, &_tmp27_, &_inner_error_); + photo_table_attach_editable (_tmp19_, _tmp20_, &_tmp22_, &_inner_error_); #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp24_); + _database_table_unref0 (_tmp19_); #line 3957 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 28545 "Photo.c" +#line 28635 "Photo.c" goto __finally404; } #line 3958 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = backing; + _tmp23_ = backing; #line 3958 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _backing_photo_row_ref0 (_tmp28_); + _tmp24_ = _backing_photo_row_ref0 (_tmp23_); #line 3958 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); #line 3958 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->editable = _tmp29_; + self->priv->editable = _tmp24_; #line 3959 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = self->priv->editable; + _tmp25_ = self->priv->editable; #line 3959 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _backing_photo_row_ref0 (_tmp30_); + _tmp26_ = _backing_photo_row_ref0 (_tmp25_); #line 3959 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 3959 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = _tmp31_; + self->backing_photo_row = _tmp26_; #line 3960 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->backing_photo_row; + _tmp27_ = self->backing_photo_row; #line 3960 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_->original_orientation; + _tmp28_ = _tmp27_->original_orientation; #line 3960 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_orientation (self, _tmp33_); -#line 28570 "Photo.c" + photo_set_orientation (self, _tmp28_); +#line 28660 "Photo.c" } __finally404: { - PhotoRow* _tmp34_; + PhotoRow* _tmp29_; #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = self->row; + _tmp29_ = self->row; #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28579 "Photo.c" +#line 28669 "Photo.c" } #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -28597,88 +28687,82 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3953 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28597 "Photo.c" +#line 28687 "Photo.c" } } } #line 3963 "/home/jens/Source/shotwell/src/Photo.vala" is_new_editable = TRUE; -#line 28603 "Photo.c" +#line 28693 "Photo.c" } #line 3966 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = only_attributes; -#line 3966 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp35_) { -#line 28609 "Photo.c" - gboolean _tmp36_; + if (only_attributes) { +#line 28697 "Photo.c" GFileInfo* info = NULL; GTimeVal timestamp = {0}; + GFileInfo* _tmp38_; + GTimeVal _tmp39_ = {0}; + BackingPhotoTable* _tmp40_; + BackingPhotoTable* _tmp41_; + BackingPhotoID _tmp42_; + GTimeVal _tmp43_; + glong _tmp44_; GFileInfo* _tmp45_; - GTimeVal _tmp46_ = {0}; - BackingPhotoTable* _tmp47_; - BackingPhotoTable* _tmp48_; - BackingPhotoID _tmp49_; - GTimeVal _tmp50_; - glong _tmp51_; - GFileInfo* _tmp52_; - gint64 _tmp53_; #line 3968 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = backing_photo_id_is_valid (&editable_id); -#line 3968 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp36_, "editable_id.is_valid()"); -#line 28626 "Photo.c" + _vala_assert (backing_photo_id_is_valid (&editable_id), "editable_id.is_valid()"); +#line 28710 "Photo.c" { - GFileInfo* _tmp37_ = NULL; - GFile* _tmp38_; - GFileInfo* _tmp39_; - GFileInfo* _tmp40_; + GFileInfo* _tmp30_ = NULL; + GFile* _tmp31_; + GFileInfo* _tmp32_; + GFileInfo* _tmp33_; #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = file; + _tmp31_ = file; #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = g_file_query_filesystem_info (_tmp38_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, NULL, &_inner_error_); + _tmp32_ = g_file_query_filesystem_info (_tmp31_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, NULL, &_inner_error_); #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp39_; + _tmp30_ = _tmp32_; #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 28640 "Photo.c" +#line 28724 "Photo.c" goto __catch405_g_error; } #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _tmp37_; + _tmp33_ = _tmp30_; #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = NULL; + _tmp30_ = NULL; #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); #line 3972 "/home/jens/Source/shotwell/src/Photo.vala" - info = _tmp40_; + info = _tmp33_; #line 3971 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp37_); -#line 28653 "Photo.c" + _g_object_unref0 (_tmp30_); +#line 28737 "Photo.c" } goto __finally405; __catch405_g_error: { GError* err = NULL; - gchar* _tmp41_; - gchar* _tmp42_; - GError* _tmp43_; - const gchar* _tmp44_; + gchar* _tmp34_; + gchar* _tmp35_; + GError* _tmp36_; + const gchar* _tmp37_; #line 3971 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 3971 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp34_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_; + _tmp35_ = _tmp34_; #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = err; + _tmp36_ = err; #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp43_->message; + _tmp37_ = _tmp36_->message; #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:3974: Unable to read editable filesystem info for %s: %s", _tmp42_, _tmp44_); + g_warning ("Photo.vala:3974: Unable to read editable filesystem info for %s: %s", _tmp35_, _tmp37_); #line 3974 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp42_); + _g_free0 (_tmp35_); #line 3975 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, FALSE, TRUE, TRUE); #line 3977 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28697,7 +28781,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3977 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28697 "Photo.c" +#line 28781 "Photo.c" } __finally405: #line 3971 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28718,32 +28802,30 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3971 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28718 "Photo.c" +#line 28802 "Photo.c" } #line 3980 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = info; + _tmp38_ = info; #line 3980 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_info_get_modification_time (_tmp45_, &_tmp46_); + g_file_info_get_modification_time (_tmp38_, &_tmp39_); #line 3980 "/home/jens/Source/shotwell/src/Photo.vala" - timestamp = _tmp46_; + timestamp = _tmp39_; #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = backing_photo_table_get_instance (); + _tmp40_ = backing_photo_table_get_instance (); #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp47_; -#line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = editable_id; + _tmp41_ = _tmp40_; #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = timestamp; + _tmp42_ = editable_id; #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _tmp50_.tv_sec; + _tmp43_ = timestamp; #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = info; + _tmp44_ = _tmp43_.tv_sec; #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = g_file_info_get_size (_tmp52_); + _tmp45_ = info; #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_update_attributes (_tmp48_, &_tmp49_, (time_t) _tmp51_, _tmp53_, &_inner_error_); + backing_photo_table_update_attributes (_tmp41_, &_tmp42_, (time_t) _tmp44_, g_file_info_get_size (_tmp45_), &_inner_error_); #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp48_); + _database_table_unref0 (_tmp41_); #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28762,76 +28844,70 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3982 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28762 "Photo.c" +#line 28844 "Photo.c" } { - PhotoRow* _tmp54_; + PhotoRow* _tmp46_; #line 3984 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = self->row; + _tmp46_ = self->row; #line 3984 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28770 "Photo.c" +#line 28852 "Photo.c" { - BackingPhotoRow* _tmp55_; - time_t _tmp56_; - GTimeVal _tmp57_; - glong _tmp58_; - BackingPhotoRow* _tmp59_; - gint64 _tmp60_; - GFileInfo* _tmp61_; - gint64 _tmp62_; - BackingPhotoRow* _tmp63_; - GTimeVal _tmp64_; - glong _tmp65_; - BackingPhotoRow* _tmp66_; - GFileInfo* _tmp67_; - gint64 _tmp68_; + BackingPhotoRow* _tmp47_; + time_t _tmp48_; + GTimeVal _tmp49_; + glong _tmp50_; + BackingPhotoRow* _tmp51_; + gint64 _tmp52_; + GFileInfo* _tmp53_; + BackingPhotoRow* _tmp54_; + GTimeVal _tmp55_; + glong _tmp56_; + BackingPhotoRow* _tmp57_; + GFileInfo* _tmp58_; #line 3985 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = self->priv->editable; + _tmp47_ = self->priv->editable; #line 3985 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = _tmp55_->timestamp; + _tmp48_ = _tmp47_->timestamp; #line 3985 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = timestamp; + _tmp49_ = timestamp; #line 3985 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _tmp57_.tv_sec; + _tmp50_ = _tmp49_.tv_sec; #line 3985 "/home/jens/Source/shotwell/src/Photo.vala" - timestamp_changed = _tmp56_ != ((time_t) _tmp58_); -#line 3986 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = self->priv->editable; + timestamp_changed = _tmp48_ != ((time_t) _tmp50_); #line 3986 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = _tmp59_->filesize; + _tmp51_ = self->priv->editable; #line 3986 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = info; + _tmp52_ = _tmp51_->filesize; #line 3986 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = g_file_info_get_size (_tmp61_); + _tmp53_ = info; #line 3986 "/home/jens/Source/shotwell/src/Photo.vala" - filesize_changed = _tmp60_ != _tmp62_; + filesize_changed = _tmp52_ != g_file_info_get_size (_tmp53_); #line 3988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = self->priv->editable; + _tmp54_ = self->priv->editable; #line 3988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = timestamp; + _tmp55_ = timestamp; #line 3988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = _tmp64_.tv_sec; + _tmp56_ = _tmp55_.tv_sec; #line 3988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_->timestamp = (time_t) _tmp65_; -#line 3989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = self->priv->editable; + _tmp54_->timestamp = (time_t) _tmp56_; #line 3989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = info; + _tmp57_ = self->priv->editable; #line 3989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = g_file_info_get_size (_tmp67_); + _tmp58_ = info; #line 3989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_->filesize = _tmp68_; -#line 28822 "Photo.c" + _tmp57_->filesize = g_file_info_get_size (_tmp58_); +#line 28898 "Photo.c" } __finally406: { - PhotoRow* _tmp69_; + PhotoRow* _tmp59_; #line 3984 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = self->row; + _tmp59_ = self->row; #line 3984 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28831 "Photo.c" +#line 28907 "Photo.c" } #line 3984 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -28851,55 +28927,52 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3984 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28851 "Photo.c" +#line 28927 "Photo.c" } } #line 3966 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (info); -#line 28856 "Photo.c" +#line 28932 "Photo.c" } else { - gboolean _tmp70_ = FALSE; - gboolean _tmp71_; + gboolean _tmp60_ = FALSE; #line 3993 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = backing_photo_id_is_valid (&editable_id); -#line 3993 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp71_) { -#line 28864 "Photo.c" - gboolean _tmp72_; + if (backing_photo_id_is_valid (&editable_id)) { +#line 28937 "Photo.c" + gboolean _tmp61_; #line 3993 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = is_new_editable; + _tmp61_ = is_new_editable; #line 3993 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = !_tmp72_; -#line 28870 "Photo.c" + _tmp60_ = !_tmp61_; +#line 28943 "Photo.c" } else { #line 3993 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = FALSE; -#line 28874 "Photo.c" + _tmp60_ = FALSE; +#line 28947 "Photo.c" } #line 3993 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp70_) { -#line 28878 "Photo.c" - BackingPhotoRow* _tmp73_; - BackingPhotoID _tmp74_; - BackingPhotoTable* _tmp75_; - BackingPhotoTable* _tmp76_; - BackingPhotoRow* _tmp77_; + if (_tmp60_) { +#line 28951 "Photo.c" + BackingPhotoRow* _tmp62_; + BackingPhotoID _tmp63_; + BackingPhotoTable* _tmp64_; + BackingPhotoTable* _tmp65_; + BackingPhotoRow* _tmp66_; #line 3998 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = backing; + _tmp62_ = backing; #line 3998 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = editable_id; + _tmp63_ = editable_id; #line 3998 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_->id = _tmp74_; + _tmp62_->id = _tmp63_; #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = backing_photo_table_get_instance (); + _tmp64_ = backing_photo_table_get_instance (); #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = _tmp75_; + _tmp65_ = _tmp64_; #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = backing; + _tmp66_ = backing; #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_update (_tmp76_, _tmp77_, &_inner_error_); + backing_photo_table_update (_tmp65_, _tmp66_, &_inner_error_); #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp76_); + _database_table_unref0 (_tmp65_); #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" @@ -28916,82 +28989,82 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 3999 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 28916 "Photo.c" +#line 28989 "Photo.c" } { - PhotoRow* _tmp78_; + PhotoRow* _tmp67_; #line 4000 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = self->row; + _tmp67_ = self->row; #line 4000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 28924 "Photo.c" +#line 28997 "Photo.c" { + BackingPhotoRow* _tmp68_; + time_t _tmp69_; + BackingPhotoRow* _tmp70_; + time_t _tmp71_; + BackingPhotoRow* _tmp72_; + gint64 _tmp73_; + BackingPhotoRow* _tmp74_; + gint64 _tmp75_; + BackingPhotoRow* _tmp76_; + BackingPhotoRow* _tmp77_; + BackingPhotoRow* _tmp78_; BackingPhotoRow* _tmp79_; - time_t _tmp80_; - BackingPhotoRow* _tmp81_; - time_t _tmp82_; - BackingPhotoRow* _tmp83_; - gint64 _tmp84_; - BackingPhotoRow* _tmp85_; - gint64 _tmp86_; - BackingPhotoRow* _tmp87_; - BackingPhotoRow* _tmp88_; - BackingPhotoRow* _tmp89_; - BackingPhotoRow* _tmp90_; - BackingPhotoRow* _tmp91_; - Orientation _tmp92_; + BackingPhotoRow* _tmp80_; + Orientation _tmp81_; #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = self->priv->editable; + _tmp68_ = self->priv->editable; #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = _tmp79_->timestamp; + _tmp69_ = _tmp68_->timestamp; #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = backing; + _tmp70_ = backing; #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = _tmp81_->timestamp; + _tmp71_ = _tmp70_->timestamp; #line 4001 "/home/jens/Source/shotwell/src/Photo.vala" - timestamp_changed = _tmp80_ != _tmp82_; + timestamp_changed = _tmp69_ != _tmp71_; #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = self->priv->editable; + _tmp72_ = self->priv->editable; #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = _tmp83_->filesize; + _tmp73_ = _tmp72_->filesize; #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = backing; + _tmp74_ = backing; #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = _tmp85_->filesize; + _tmp75_ = _tmp74_->filesize; #line 4002 "/home/jens/Source/shotwell/src/Photo.vala" - filesize_changed = _tmp84_ != _tmp86_; + filesize_changed = _tmp73_ != _tmp75_; #line 4004 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = backing; + _tmp76_ = backing; #line 4004 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = _backing_photo_row_ref0 (_tmp87_); + _tmp77_ = _backing_photo_row_ref0 (_tmp76_); #line 4004 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->priv->editable); #line 4004 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->editable = _tmp88_; + self->priv->editable = _tmp77_; #line 4005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = self->priv->editable; + _tmp78_ = self->priv->editable; #line 4005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _backing_photo_row_ref0 (_tmp89_); + _tmp79_ = _backing_photo_row_ref0 (_tmp78_); #line 4005 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 4005 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = _tmp90_; + self->backing_photo_row = _tmp79_; #line 4006 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = self->backing_photo_row; + _tmp80_ = self->backing_photo_row; #line 4006 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = _tmp91_->original_orientation; + _tmp81_ = _tmp80_->original_orientation; #line 4006 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_orientation (self, _tmp92_); -#line 28982 "Photo.c" + photo_set_orientation (self, _tmp81_); +#line 29055 "Photo.c" } __finally407: { - PhotoRow* _tmp93_; + PhotoRow* _tmp82_; #line 4000 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = self->row; + _tmp82_ = self->row; #line 4000 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 28991 "Photo.c" +#line 29064 "Photo.c" } #line 4000 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -29009,47 +29082,42 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 4000 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29009 "Photo.c" +#line 29082 "Photo.c" } } } } #line 4012 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = new_reader; -#line 4012 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp94_ != NULL) { -#line 29018 "Photo.c" + if (new_reader != NULL) { +#line 29089 "Photo.c" { - PhotoBackingReaders* _tmp95_; + PhotoBackingReaders* _tmp83_; #line 4013 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = self->priv->readers; + _tmp83_ = self->priv->readers; #line 4013 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 29025 "Photo.c" +#line 29096 "Photo.c" { - PhotoBackingReaders* _tmp96_; - PhotoFileReader* _tmp97_; - PhotoFileReader* _tmp98_; -#line 4014 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = self->priv->readers; + PhotoBackingReaders* _tmp84_; + PhotoFileReader* _tmp85_; #line 4014 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = new_reader; + _tmp84_ = self->priv->readers; #line 4014 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = _photo_file_adapter_ref0 (_tmp97_); + _tmp85_ = _photo_file_adapter_ref0 (new_reader); #line 4014 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_file_adapter_unref0 (_tmp96_->editable); + _photo_file_adapter_unref0 (_tmp84_->editable); #line 4014 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_->editable = _tmp98_; -#line 29040 "Photo.c" + _tmp84_->editable = _tmp85_; +#line 29108 "Photo.c" } __finally408: { - PhotoBackingReaders* _tmp99_; + PhotoBackingReaders* _tmp86_; #line 4013 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = self->priv->readers; + _tmp86_ = self->priv->readers; #line 4013 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29049 "Photo.c" +#line 29117 "Photo.c" } #line 4013 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -29067,231 +29135,214 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (old_reader); #line 4013 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29067 "Photo.c" +#line 29135 "Photo.c" } } } #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = only_attributes; + if (!only_attributes) { +#line 29141 "Photo.c" + PhotoFileReader* _tmp88_; + PhotoFileReader* _tmp89_; #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp101_) { -#line 29075 "Photo.c" - PhotoFileReader* _tmp102_; - PhotoFileReader* _tmp103_; + _tmp88_ = reader; #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = reader; + _tmp89_ = old_reader; #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = old_reader; -#line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = _tmp102_ != _tmp103_; -#line 29084 "Photo.c" + _tmp87_ = _tmp88_ != _tmp89_; +#line 29150 "Photo.c" } else { #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = FALSE; -#line 29088 "Photo.c" + _tmp87_ = FALSE; +#line 29154 "Photo.c" } #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp100_) { -#line 29092 "Photo.c" - GFile* _tmp104_ = NULL; - PhotoFileReader* _tmp105_; - GFile* _tmp108_ = NULL; - PhotoFileReader* _tmp109_; + if (_tmp87_) { +#line 29158 "Photo.c" + GFile* _tmp90_ = NULL; + PhotoFileReader* _tmp91_; + GFile* _tmp94_ = NULL; #line 4019 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = old_reader; + _tmp91_ = old_reader; #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp105_ != NULL) { -#line 29103 "Photo.c" - PhotoFileReader* _tmp106_; - GFile* _tmp107_; + if (_tmp91_ != NULL) { +#line 29168 "Photo.c" + PhotoFileReader* _tmp92_; + GFile* _tmp93_; #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = old_reader; + _tmp92_ = old_reader; #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp93_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp104_); + _g_object_unref0 (_tmp90_); #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = _tmp107_; -#line 29114 "Photo.c" + _tmp90_ = _tmp93_; +#line 29179 "Photo.c" } else { #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp104_); + _g_object_unref0 (_tmp90_); #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = NULL; -#line 29120 "Photo.c" + _tmp90_ = NULL; +#line 29185 "Photo.c" } #line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_ = new_reader; -#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp109_ != NULL) { -#line 29126 "Photo.c" - PhotoFileReader* _tmp110_; - GFile* _tmp111_; + if (new_reader != NULL) { +#line 29189 "Photo.c" + GFile* _tmp95_; #line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_ = new_reader; + _tmp95_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (new_reader, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp111_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _g_object_unref0 (_tmp94_); #line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp108_); -#line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp108_ = _tmp111_; -#line 29137 "Photo.c" + _tmp94_ = _tmp95_; +#line 29197 "Photo.c" } else { #line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp108_); + _g_object_unref0 (_tmp94_); #line 4021 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp108_ = NULL; -#line 29143 "Photo.c" + _tmp94_ = NULL; +#line 29203 "Photo.c" } #line 4020 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_editable_replaced (self, _tmp104_, _tmp108_); + photo_notify_editable_replaced (self, _tmp90_, _tmp94_); #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp108_); + _g_object_unref0 (_tmp94_); #line 4018 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp104_); -#line 29151 "Photo.c" + _g_object_unref0 (_tmp90_); +#line 29211 "Photo.c" } #line 4024 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_ = g_new0 (gchar*, 0 + 1); + _tmp96_ = g_new0 (gchar*, 0 + 1); #line 4024 "/home/jens/Source/shotwell/src/Photo.vala" - alteration_list = _tmp112_; + alteration_list = _tmp96_; #line 4024 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list_length1 = 0; #line 4024 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_list_size_ = alteration_list_length1; #line 4025 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = timestamp_changed; + _tmp97_ = timestamp_changed; #line 4025 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp113_) { -#line 29165 "Photo.c" - gchar** _tmp114_; - gint _tmp114__length1; - gchar* _tmp115_; - gchar** _tmp116_; - gint _tmp116__length1; - gchar* _tmp117_; - gboolean _tmp118_; + if (_tmp97_) { +#line 29225 "Photo.c" + gchar** _tmp98_; + gint _tmp98__length1; + gchar* _tmp99_; + gchar** _tmp100_; + gint _tmp100__length1; + gchar* _tmp101_; #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = alteration_list; + _tmp98_ = alteration_list; #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114__length1 = alteration_list_length1; + _tmp98__length1 = alteration_list_length1; #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_ = g_strdup ("metadata:editable-timestamp"); + _tmp99_ = g_strdup ("metadata:editable-timestamp"); #line 4026 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp115_); + _vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp99_); #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_ = alteration_list; + _tmp100_ = alteration_list; #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116__length1 = alteration_list_length1; + _tmp100__length1 = alteration_list_length1; #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp117_ = g_strdup ("metadata:baseline-timestamp"); + _tmp101_ = g_strdup ("metadata:baseline-timestamp"); #line 4027 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp117_); -#line 4029 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_ = photo_is_editable_source (self); + _vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp101_); #line 4029 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp118_) { -#line 29193 "Photo.c" - gchar** _tmp119_; - gint _tmp119__length1; - gchar* _tmp120_; + if (photo_is_editable_source (self)) { +#line 29250 "Photo.c" + gchar** _tmp102_; + gint _tmp102__length1; + gchar* _tmp103_; #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp119_ = alteration_list; + _tmp102_ = alteration_list; #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp119__length1 = alteration_list_length1; + _tmp102__length1 = alteration_list_length1; #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_ = g_strdup ("metadata:source-timestamp"); + _tmp103_ = g_strdup ("metadata:source-timestamp"); #line 4030 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add109 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_); -#line 29205 "Photo.c" + _vala_array_add109 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp103_); +#line 29262 "Photo.c" } } #line 4033 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp122_ = filesize_changed; + _tmp105_ = filesize_changed; #line 4033 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp122_) { + if (_tmp105_) { #line 4033 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp121_ = TRUE; -#line 29214 "Photo.c" + _tmp104_ = TRUE; +#line 29271 "Photo.c" } else { - PhotoFileReader* _tmp123_; #line 4033 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp123_ = new_reader; -#line 4033 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp121_ = _tmp123_ != NULL; -#line 29221 "Photo.c" + _tmp104_ = new_reader != NULL; +#line 29275 "Photo.c" } #line 4033 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp121_) { -#line 29225 "Photo.c" - gchar** _tmp124_; - gint _tmp124__length1; - gchar* _tmp125_; - gchar** _tmp126_; - gint _tmp126__length1; - gchar* _tmp127_; - gboolean _tmp128_; + if (_tmp104_) { +#line 29279 "Photo.c" + gchar** _tmp106_; + gint _tmp106__length1; + gchar* _tmp107_; + gchar** _tmp108_; + gint _tmp108__length1; + gchar* _tmp109_; #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_ = alteration_list; + _tmp106_ = alteration_list; #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124__length1 = alteration_list_length1; + _tmp106__length1 = alteration_list_length1; #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp125_ = g_strdup ("image:editable"); + _tmp107_ = g_strdup ("image:editable"); #line 4034 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add110 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp125_); + _vala_array_add110 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp107_); #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126_ = alteration_list; + _tmp108_ = alteration_list; #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126__length1 = alteration_list_length1; + _tmp108__length1 = alteration_list_length1; #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp127_ = g_strdup ("image:baseline"); + _tmp109_ = g_strdup ("image:baseline"); #line 4035 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add111 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp127_); -#line 4037 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp128_ = photo_is_editable_source (self); + _vala_array_add111 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp109_); #line 4037 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp128_) { -#line 29253 "Photo.c" - gchar** _tmp129_; - gint _tmp129__length1; - gchar* _tmp130_; + if (photo_is_editable_source (self)) { +#line 29304 "Photo.c" + gchar** _tmp110_; + gint _tmp110__length1; + gchar* _tmp111_; #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp129_ = alteration_list; + _tmp110_ = alteration_list; #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp129__length1 = alteration_list_length1; + _tmp110__length1 = alteration_list_length1; #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp130_ = g_strdup ("image:source"); + _tmp111_ = g_strdup ("image:source"); #line 4038 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_array_add112 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_); -#line 29265 "Photo.c" + _vala_array_add112 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp111_); +#line 29316 "Photo.c" } } #line 4041 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp131_ = alteration_list; + _tmp112_ = alteration_list; #line 4041 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp131__length1 = alteration_list_length1; + _tmp112__length1 = alteration_list_length1; #line 4041 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp131__length1 > 0) { -#line 29274 "Photo.c" - gchar** _tmp132_; - gint _tmp132__length1; - Alteration* _tmp133_; - Alteration* _tmp134_; + if (_tmp112__length1 > 0) { +#line 29325 "Photo.c" + gchar** _tmp113_; + gint _tmp113__length1; + Alteration* _tmp114_; + Alteration* _tmp115_; #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp132_ = alteration_list; + _tmp113_ = alteration_list; #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp132__length1 = alteration_list_length1; + _tmp113__length1 = alteration_list_length1; #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp133_ = alteration_new_from_array (_tmp132_, _tmp132__length1); + _tmp114_ = alteration_new_from_array (_tmp113_, _tmp113__length1); #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp134_ = _tmp133_; + _tmp115_ = _tmp114_; #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp134_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp115_); #line 4042 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp134_); -#line 29291 "Photo.c" + _alteration_unref0 (_tmp115_); +#line 29342 "Photo.c" } #line 3924 "/home/jens/Source/shotwell/src/Photo.vala" alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL); @@ -29305,21 +29356,24 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF _photo_file_adapter_unref0 (reader); #line 3924 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (old_reader); -#line 29305 "Photo.c" +#line 29356 "Photo.c" } -static void photo_detach_editable (Photo* self, gboolean delete_editable, gboolean remove_transformations, gboolean notify) { +static void +photo_detach_editable (Photo* self, + gboolean delete_editable, + gboolean remove_transformations, + gboolean notify) +{ gboolean has_editable = FALSE; GFile* editable_file = NULL; gboolean _tmp8_; - gboolean _tmp28_; - gboolean _tmp29_; - gboolean _tmp31_ = FALSE; - gboolean _tmp32_; - gboolean _tmp42_ = FALSE; - gboolean _tmp43_ = FALSE; - gboolean _tmp44_; + gboolean _tmp26_; + gboolean _tmp28_ = FALSE; + gboolean _tmp38_ = FALSE; + gboolean _tmp39_ = FALSE; + gboolean _tmp40_; GError * _inner_error_ = NULL; #line 4045 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -29329,14 +29383,14 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole has_editable = FALSE; #line 4049 "/home/jens/Source/shotwell/src/Photo.vala" editable_file = NULL; -#line 29329 "Photo.c" +#line 29383 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 4050 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 4050 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 29336 "Photo.c" +#line 29390 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; @@ -29346,7 +29400,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp2_ = _tmp1_->editable; #line 4051 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 29346 "Photo.c" +#line 29400 "Photo.c" PhotoBackingReaders* _tmp3_; PhotoFileReader* _tmp4_; GFile* _tmp5_; @@ -29369,7 +29423,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp6_->editable = NULL; #line 4054 "/home/jens/Source/shotwell/src/Photo.vala" has_editable = TRUE; -#line 29369 "Photo.c" +#line 29423 "Photo.c" } } __finally409: @@ -29379,7 +29433,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp7_ = self->priv->readers; #line 4050 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29379 "Photo.c" +#line 29433 "Photo.c" } #line 4050 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -29391,18 +29445,18 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4050 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29391 "Photo.c" +#line 29445 "Photo.c" } } #line 4058 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = has_editable; #line 4058 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp8_) { -#line 29398 "Photo.c" +#line 29452 "Photo.c" BackingPhotoID editable_id = {0}; #line 4059 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_id_init (&editable_id, BACKING_PHOTO_ID_INVALID); -#line 29402 "Photo.c" +#line 29456 "Photo.c" { { PhotoRow* _tmp9_; @@ -29410,14 +29464,13 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole _tmp9_ = self->row; #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 29410 "Photo.c" +#line 29464 "Photo.c" { PhotoRow* _tmp10_; BackingPhotoID _tmp11_; - gboolean _tmp12_; - PhotoRow* _tmp16_; + PhotoRow* _tmp15_; + BackingPhotoRow* _tmp16_; BackingPhotoRow* _tmp17_; - BackingPhotoRow* _tmp18_; #line 4062 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = self->row; #line 4062 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29425,55 +29478,53 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole #line 4062 "/home/jens/Source/shotwell/src/Photo.vala" editable_id = _tmp11_; #line 4063 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = backing_photo_id_is_valid (&editable_id); -#line 4063 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { -#line 29428 "Photo.c" + if (backing_photo_id_is_valid (&editable_id)) { +#line 29479 "Photo.c" + PhotoTable* _tmp12_; PhotoTable* _tmp13_; - PhotoTable* _tmp14_; - PhotoRow* _tmp15_; + PhotoRow* _tmp14_; #line 4064 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_table_get_instance (); + _tmp12_ = photo_table_get_instance (); #line 4064 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 4064 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = self->row; + _tmp14_ = self->row; #line 4064 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_detach_editable (_tmp14_, _tmp15_, &_inner_error_); + photo_table_detach_editable (_tmp13_, _tmp14_, &_inner_error_); #line 4064 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp14_); + _database_table_unref0 (_tmp13_); #line 4064 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29444 "Photo.c" +#line 29495 "Photo.c" goto __finally411; } } #line 4065 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->row; + _tmp15_ = self->row; #line 4065 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_->master; + _tmp16_ = _tmp15_->master; #line 4065 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _backing_photo_row_ref0 (_tmp17_); + _tmp17_ = _backing_photo_row_ref0 (_tmp16_); #line 4065 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_photo_row); #line 4065 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_photo_row = _tmp18_; -#line 29458 "Photo.c" + self->backing_photo_row = _tmp17_; +#line 29509 "Photo.c" } __finally411: { - PhotoRow* _tmp19_; + PhotoRow* _tmp18_; #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = self->row; + _tmp18_ = self->row; #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 29467 "Photo.c" +#line 29518 "Photo.c" } #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 29473 "Photo.c" +#line 29524 "Photo.c" goto __catch410_database_error; } #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29484,7 +29535,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4061 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29484 "Photo.c" +#line 29535 "Photo.c" } } } @@ -29492,21 +29543,21 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole __catch410_database_error: { GError* err = NULL; - GError* _tmp20_; - const gchar* _tmp21_; + GError* _tmp19_; + const gchar* _tmp20_; #line 4060 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 4060 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 4068 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = err; + _tmp19_ = err; #line 4068 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_->message; + _tmp20_ = _tmp19_->message; #line 4068 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4068: Unable to remove editable from PhotoTable: %s", _tmp21_); + g_warning ("Photo.vala:4068: Unable to remove editable from PhotoTable: %s", _tmp20_); #line 4060 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29506 "Photo.c" +#line 29557 "Photo.c" } __finally410: #line 4060 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29519,33 +29570,30 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4060 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29519 "Photo.c" +#line 29570 "Photo.c" } { - gboolean _tmp22_; #line 4072 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = backing_photo_id_is_valid (&editable_id); -#line 4072 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_) { -#line 29527 "Photo.c" - BackingPhotoTable* _tmp23_; - BackingPhotoTable* _tmp24_; - BackingPhotoID _tmp25_; + if (backing_photo_id_is_valid (&editable_id)) { +#line 29575 "Photo.c" + BackingPhotoTable* _tmp21_; + BackingPhotoTable* _tmp22_; + BackingPhotoID _tmp23_; #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = backing_photo_table_get_instance (); + _tmp21_ = backing_photo_table_get_instance (); #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = editable_id; + _tmp23_ = editable_id; #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_remove (_tmp24_, &_tmp25_, &_inner_error_); + backing_photo_table_remove (_tmp22_, &_tmp23_, &_inner_error_); #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp24_); + _database_table_unref0 (_tmp22_); #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 29545 "Photo.c" +#line 29593 "Photo.c" goto __catch412_database_error; } #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29556,7 +29604,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4073 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29556 "Photo.c" +#line 29604 "Photo.c" } } } @@ -29564,21 +29612,21 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole __catch412_database_error: { GError* err = NULL; - GError* _tmp26_; - const gchar* _tmp27_; + GError* _tmp24_; + const gchar* _tmp25_; #line 4071 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 4071 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 4075 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = err; + _tmp24_ = err; #line 4075 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_->message; + _tmp25_ = _tmp24_->message; #line 4075 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4075: Unable to remove editable from BackingPhotoTable: %s", _tmp27_); + g_warning ("Photo.vala:4075: Unable to remove editable from BackingPhotoTable: %s", _tmp25_); #line 4071 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29578 "Photo.c" +#line 29626 "Photo.c" } __finally412: #line 4071 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29591,59 +29639,55 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4071 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29591 "Photo.c" +#line 29639 "Photo.c" } } #line 4079 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = remove_transformations; -#line 4079 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp28_) { + if (remove_transformations) { #line 4080 "/home/jens/Source/shotwell/src/Photo.vala" photo_internal_remove_all_transformations (self, FALSE); -#line 29600 "Photo.c" +#line 29646 "Photo.c" } #line 4082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = has_editable; + _tmp26_ = has_editable; #line 4082 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp29_) { -#line 29606 "Photo.c" - GFile* _tmp30_; + if (_tmp26_) { +#line 29652 "Photo.c" + GFile* _tmp27_; #line 4083 "/home/jens/Source/shotwell/src/Photo.vala" photo_notify_baseline_replaced (self); #line 4084 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = editable_file; + _tmp27_ = editable_file; #line 4084 "/home/jens/Source/shotwell/src/Photo.vala" - photo_notify_editable_replaced (self, _tmp30_, NULL); -#line 29614 "Photo.c" + photo_notify_editable_replaced (self, _tmp27_, NULL); +#line 29660 "Photo.c" } #line 4087 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = delete_editable; -#line 4087 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp32_) { -#line 29620 "Photo.c" - GFile* _tmp33_; + if (delete_editable) { +#line 29664 "Photo.c" + GFile* _tmp29_; #line 4087 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = editable_file; + _tmp29_ = editable_file; #line 4087 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp33_ != NULL; -#line 29626 "Photo.c" + _tmp28_ = _tmp29_ != NULL; +#line 29670 "Photo.c" } else { #line 4087 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = FALSE; -#line 29630 "Photo.c" + _tmp28_ = FALSE; +#line 29674 "Photo.c" } #line 4087 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp31_) { -#line 29634 "Photo.c" + if (_tmp28_) { +#line 29678 "Photo.c" { - GFile* _tmp34_; + GFile* _tmp30_; #line 4089 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = editable_file; + _tmp30_ = editable_file; #line 4089 "/home/jens/Source/shotwell/src/Photo.vala" - g_file_trash (_tmp34_, NULL, &_inner_error_); + g_file_trash (_tmp30_, NULL, &_inner_error_); #line 4089 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 29643 "Photo.c" +#line 29687 "Photo.c" goto __catch413_g_error; } } @@ -29651,40 +29695,40 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole __catch413_g_error: { GError* err = NULL; - GFile* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - GError* _tmp40_; - const gchar* _tmp41_; + GFile* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; + GError* _tmp36_; + const gchar* _tmp37_; #line 4088 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 4088 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = editable_file; + _tmp31_ = editable_file; #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = g_file_get_path (_tmp35_); + _tmp32_ = g_file_get_path (_tmp31_); #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_; + _tmp33_ = _tmp32_; #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp34_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tmp38_; + _tmp35_ = _tmp34_; #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = err; + _tmp36_ = err; #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_->message; + _tmp37_ = _tmp36_->message; #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:4091: Unable to trash editable %s for %s: %s", _tmp37_, _tmp39_, _tmp41_); + g_warning ("Photo.vala:4091: Unable to trash editable %s for %s: %s", _tmp33_, _tmp35_, _tmp37_); #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp35_); #line 4091 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp33_); #line 4088 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 29684 "Photo.c" +#line 29728 "Photo.c" } __finally413: #line 4088 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29697,87 +29741,88 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole g_clear_error (&_inner_error_); #line 4088 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29697 "Photo.c" +#line 29741 "Photo.c" } } #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = has_editable; + _tmp40_ = has_editable; #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_) { + if (_tmp40_) { #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = TRUE; -#line 29706 "Photo.c" + _tmp39_ = TRUE; +#line 29750 "Photo.c" } else { - gboolean _tmp45_; #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = remove_transformations; -#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp45_; -#line 29713 "Photo.c" + _tmp39_ = remove_transformations; +#line 29754 "Photo.c" } #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp43_) { -#line 29717 "Photo.c" - gboolean _tmp46_; -#line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = notify; + if (_tmp39_) { #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp46_; -#line 29723 "Photo.c" + _tmp38_ = notify; +#line 29760 "Photo.c" } else { #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = FALSE; -#line 29727 "Photo.c" + _tmp38_ = FALSE; +#line 29764 "Photo.c" } #line 4096 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp42_) { -#line 29731 "Photo.c" - Alteration* _tmp47_; - Alteration* _tmp48_; + if (_tmp38_) { +#line 29768 "Photo.c" + Alteration* _tmp41_; + Alteration* _tmp42_; #line 4097 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = alteration_new ("image", "revert"); + _tmp41_ = alteration_new ("image", "revert"); #line 4097 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp47_; + _tmp42_ = _tmp41_; #line 4097 "/home/jens/Source/shotwell/src/Photo.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp48_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp42_); #line 4097 "/home/jens/Source/shotwell/src/Photo.vala" - _alteration_unref0 (_tmp48_); -#line 29742 "Photo.c" + _alteration_unref0 (_tmp42_); +#line 29779 "Photo.c" } #line 4045 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (editable_file); -#line 29746 "Photo.c" +#line 29783 "Photo.c" } -static void _photo_on_reimport_editable_one_shot_callback (gpointer self) { +static void +_photo_on_reimport_editable_one_shot_callback (gpointer self) +{ #line 4119 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_reimport_editable ((Photo*) self); -#line 29753 "Photo.c" +#line 29792 "Photo.c" } -static void _photo_on_update_editable_attributes_one_shot_callback (gpointer self) { +static void +_photo_on_update_editable_attributes_one_shot_callback (gpointer self) +{ #line 4128 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_update_editable_attributes ((Photo*) self); -#line 29760 "Photo.c" +#line 29801 "Photo.c" } -static void _photo_on_remove_editable_one_shot_callback (gpointer self) { +static void +_photo_on_remove_editable_one_shot_callback (gpointer self) +{ #line 4137 "/home/jens/Source/shotwell/src/Photo.vala" photo_on_remove_editable ((Photo*) self); -#line 29767 "Photo.c" +#line 29810 "Photo.c" } -static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* other_file, GFileMonitorEvent event) { - GFileMonitorEvent _tmp12_; - GEnumValue* _tmp13_; - GFile* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - GFileMonitorEvent _tmp17_; +static void +photo_on_editable_file_changed (Photo* self, + GFile* file, + GFile* other_file, + GFileMonitorEvent event) +{ + GEnumValue* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; GError * _inner_error_ = NULL; #line 4100 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); @@ -29785,24 +29830,22 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth g_return_if_fail (G_IS_FILE (file)); #line 4100 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file)); -#line 29785 "Photo.c" +#line 29830 "Photo.c" { PhotoBackingReaders* _tmp0_; #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->readers; #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_readers); -#line 29792 "Photo.c" +#line 29837 "Photo.c" { PhotoBackingReaders* _tmp1_; PhotoFileReader* _tmp2_; - GFile* _tmp3_; - PhotoBackingReaders* _tmp4_; - PhotoFileReader* _tmp5_; + PhotoBackingReaders* _tmp3_; + PhotoFileReader* _tmp4_; + GFile* _tmp5_; GFile* _tmp6_; - GFile* _tmp7_; - gboolean _tmp8_; - gboolean _tmp9_; + gboolean _tmp7_; #line 4103 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = self->priv->readers; #line 4103 "/home/jens/Source/shotwell/src/Photo.vala" @@ -29810,45 +29853,41 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth #line 4103 "/home/jens/Source/shotwell/src/Photo.vala" _vala_assert (_tmp2_ != NULL, "readers.editable != null"); #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = file; -#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->readers; -#line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->editable; + _tmp3_ = self->priv->readers; #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp4_ = _tmp3_->editable; #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp5_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_file_equal (_tmp3_, _tmp7_); + _tmp6_ = _tmp5_; #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = !_tmp8_; + _tmp7_ = !g_file_equal (file, _tmp6_); #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 4105 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp9_) { -#line 29827 "Photo.c" + if (_tmp7_) { +#line 29866 "Photo.c" { - PhotoBackingReaders* _tmp10_; + PhotoBackingReaders* _tmp8_; #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->priv->readers; + _tmp8_ = self->priv->readers; #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29834 "Photo.c" +#line 29873 "Photo.c" } #line 4109 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29838 "Photo.c" +#line 29877 "Photo.c" } } __finally414: { - PhotoBackingReaders* _tmp11_; + PhotoBackingReaders* _tmp9_; #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = self->priv->readers; + _tmp9_ = self->priv->readers; #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_readers); -#line 29848 "Photo.c" +#line 29887 "Photo.c" } #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -29858,130 +29897,126 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth g_clear_error (&_inner_error_); #line 4102 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 29858 "Photo.c" +#line 29897 "Photo.c" } } #line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = event; -#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp12_); + _tmp10_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), event); #line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = file; + _tmp11_ = g_file_get_path (file); #line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = g_file_get_path (_tmp14_); + _tmp12_ = _tmp11_; #line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + g_debug ("Photo.vala:4113: EDITABLE %s: %s", (_tmp10_ != NULL) ? _tmp10_->value_name : NULL, _tmp12_); #line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4113: EDITABLE %s: %s", (_tmp13_ != NULL) ? _tmp13_->value_name : NULL, _tmp16_); -#line 4113 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp12_); #line 4115 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = event; -#line 4115 "/home/jens/Source/shotwell/src/Photo.vala" - switch (_tmp17_) { + switch (event) { #line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CHANGED: #line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CREATED: -#line 29883 "Photo.c" +#line 29916 "Photo.c" { - OneShotScheduler* _tmp18_; - OneShotScheduler* _tmp20_; + OneShotScheduler* _tmp13_; + OneShotScheduler* _tmp15_; #line 4118 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->priv->reimport_editable_scheduler; + _tmp13_ = self->priv->reimport_editable_scheduler; #line 4118 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_ == NULL) { -#line 29891 "Photo.c" - OneShotScheduler* _tmp19_; + if (_tmp13_ == NULL) { +#line 29924 "Photo.c" + OneShotScheduler* _tmp14_; #line 4119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = one_shot_scheduler_new ("Photo.reimport_editable", _photo_on_reimport_editable_one_shot_callback, self); + _tmp14_ = one_shot_scheduler_new ("Photo.reimport_editable", _photo_on_reimport_editable_one_shot_callback, self); #line 4119 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->reimport_editable_scheduler); #line 4119 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->reimport_editable_scheduler = _tmp19_; -#line 29899 "Photo.c" + self->priv->reimport_editable_scheduler = _tmp14_; +#line 29932 "Photo.c" } #line 4123 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->priv->reimport_editable_scheduler; + _tmp15_ = self->priv->reimport_editable_scheduler; #line 4123 "/home/jens/Source/shotwell/src/Photo.vala" - one_shot_scheduler_after_timeout (_tmp20_, (guint) 1000, TRUE); + one_shot_scheduler_after_timeout (_tmp15_, (guint) 1000, TRUE); #line 4124 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29907 "Photo.c" +#line 29940 "Photo.c" } #line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: -#line 29911 "Photo.c" +#line 29944 "Photo.c" { - OneShotScheduler* _tmp21_; - OneShotScheduler* _tmp23_; + OneShotScheduler* _tmp16_; + OneShotScheduler* _tmp18_; #line 4127 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = self->priv->update_editable_attributes_scheduler; + _tmp16_ = self->priv->update_editable_attributes_scheduler; #line 4127 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_ == NULL) { -#line 29919 "Photo.c" - OneShotScheduler* _tmp22_; + if (_tmp16_ == NULL) { +#line 29952 "Photo.c" + OneShotScheduler* _tmp17_; #line 4128 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = one_shot_scheduler_new ("Photo.update_editable_attributes", _photo_on_update_editable_attributes_one_shot_callback, self); + _tmp17_ = one_shot_scheduler_new ("Photo.update_editable_attributes", _photo_on_update_editable_attributes_one_shot_callback, self); #line 4128 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->update_editable_attributes_scheduler); #line 4128 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->update_editable_attributes_scheduler = _tmp22_; -#line 29927 "Photo.c" + self->priv->update_editable_attributes_scheduler = _tmp17_; +#line 29960 "Photo.c" } #line 4132 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = self->priv->update_editable_attributes_scheduler; + _tmp18_ = self->priv->update_editable_attributes_scheduler; #line 4132 "/home/jens/Source/shotwell/src/Photo.vala" - one_shot_scheduler_after_timeout (_tmp23_, (guint) 1000, TRUE); + one_shot_scheduler_after_timeout (_tmp18_, (guint) 1000, TRUE); #line 4133 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29935 "Photo.c" +#line 29968 "Photo.c" } #line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_DELETED: -#line 29939 "Photo.c" +#line 29972 "Photo.c" { - OneShotScheduler* _tmp24_; - OneShotScheduler* _tmp26_; + OneShotScheduler* _tmp19_; + OneShotScheduler* _tmp21_; #line 4136 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = self->priv->remove_editable_scheduler; + _tmp19_ = self->priv->remove_editable_scheduler; #line 4136 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp24_ == NULL) { -#line 29947 "Photo.c" - OneShotScheduler* _tmp25_; + if (_tmp19_ == NULL) { +#line 29980 "Photo.c" + OneShotScheduler* _tmp20_; #line 4137 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = one_shot_scheduler_new ("Photo.remove_editable", _photo_on_remove_editable_one_shot_callback, self); + _tmp20_ = one_shot_scheduler_new ("Photo.remove_editable", _photo_on_remove_editable_one_shot_callback, self); #line 4137 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->remove_editable_scheduler); #line 4137 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->remove_editable_scheduler = _tmp25_; -#line 29955 "Photo.c" + self->priv->remove_editable_scheduler = _tmp20_; +#line 29988 "Photo.c" } #line 4141 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = self->priv->remove_editable_scheduler; + _tmp21_ = self->priv->remove_editable_scheduler; #line 4141 "/home/jens/Source/shotwell/src/Photo.vala" - one_shot_scheduler_after_timeout (_tmp26_, (guint) 3000, TRUE); + one_shot_scheduler_after_timeout (_tmp21_, (guint) 3000, TRUE); #line 4142 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29963 "Photo.c" +#line 29996 "Photo.c" } default: #line 4115 "/home/jens/Source/shotwell/src/Photo.vala" case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -#line 29968 "Photo.c" +#line 30001 "Photo.c" { #line 4147 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 29972 "Photo.c" +#line 30005 "Photo.c" } } #line 4152 "/home/jens/Source/shotwell/src/Photo.vala" photo_discard_prefetched (self); -#line 29977 "Photo.c" +#line 30010 "Photo.c" } -static void photo_on_reimport_editable (Photo* self) { +static void +photo_on_reimport_editable (Photo* self) +{ gchar* _tmp0_; gchar* _tmp1_; GError * _inner_error_ = NULL; @@ -29997,13 +30032,13 @@ static void photo_on_reimport_editable (Photo* self) { g_debug ("Photo.vala:4159: Reimporting editable for %s", _tmp1_); #line 4159 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp1_); -#line 29997 "Photo.c" +#line 30032 "Photo.c" { #line 4161 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable (self, &_inner_error_); #line 4161 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 30003 "Photo.c" +#line 30038 "Photo.c" goto __catch415_g_error; } } @@ -30034,7 +30069,7 @@ static void photo_on_reimport_editable (Photo* self) { _g_free0 (_tmp3_); #line 4160 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 30033 "Photo.c" +#line 30068 "Photo.c" } __finally415: #line 4160 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30045,12 +30080,14 @@ static void photo_on_reimport_editable (Photo* self) { g_clear_error (&_inner_error_); #line 4160 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30044 "Photo.c" +#line 30079 "Photo.c" } } -static void photo_on_update_editable_attributes (Photo* self) { +static void +photo_on_update_editable_attributes (Photo* self) +{ gchar* _tmp0_; gchar* _tmp1_; GError * _inner_error_ = NULL; @@ -30064,13 +30101,13 @@ static void photo_on_update_editable_attributes (Photo* self) { g_debug ("Photo.vala:4169: Updating editable attributes for %s", _tmp1_); #line 4169 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (_tmp1_); -#line 30063 "Photo.c" +#line 30100 "Photo.c" { #line 4171 "/home/jens/Source/shotwell/src/Photo.vala" photo_update_editable_attributes (self, &_inner_error_); #line 4171 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 30069 "Photo.c" +#line 30106 "Photo.c" goto __catch416_g_error; } } @@ -30092,7 +30129,7 @@ static void photo_on_update_editable_attributes (Photo* self) { g_warning ("Photo.vala:4173: Unable to update editable attributes: %s", _tmp3_); #line 4170 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 30091 "Photo.c" +#line 30128 "Photo.c" } __finally416: #line 4170 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30103,12 +30140,14 @@ static void photo_on_update_editable_attributes (Photo* self) { g_clear_error (&_inner_error_); #line 4170 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30102 "Photo.c" +#line 30139 "Photo.c" } } -static void photo_on_remove_editable (Photo* self) { +static void +photo_on_remove_editable (Photo* self) +{ PhotoFileReader* reader = NULL; PhotoFileReader* _tmp0_; PhotoFileReader* _tmp1_; @@ -30116,9 +30155,8 @@ static void photo_on_remove_editable (Photo* self) { PhotoFileReader* _tmp2_; GFile* _tmp3_; GFile* _tmp4_; - gboolean _tmp5_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; #line 4177 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 4178 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30133,7 +30171,7 @@ static void photo_on_remove_editable (Photo* self) { _photo_file_adapter_unref0 (reader); #line 4180 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30132 "Photo.c" +#line 30170 "Photo.c" } #line 4182 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = reader; @@ -30144,53 +30182,53 @@ static void photo_on_remove_editable (Photo* self) { #line 4183 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = file; #line 4183 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = g_file_query_exists (_tmp4_, NULL); -#line 4183 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 30146 "Photo.c" + if (g_file_query_exists (_tmp4_, NULL)) { +#line 30182 "Photo.c" + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; #line 4184 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 4184 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 4184 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4184: Not removing editable for %s: file exists", _tmp7_); + g_debug ("Photo.vala:4184: Not removing editable for %s: file exists", _tmp6_); #line 4184 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 4186 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 4186 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); #line 4186 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30163 "Photo.c" +#line 30199 "Photo.c" } #line 4189 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp7_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 4189 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 4189 "/home/jens/Source/shotwell/src/Photo.vala" - g_debug ("Photo.vala:4189: Removing editable for %s: file no longer exists", _tmp9_); + g_debug ("Photo.vala:4189: Removing editable for %s: file no longer exists", _tmp8_); #line 4189 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 4190 "/home/jens/Source/shotwell/src/Photo.vala" photo_detach_editable (self, FALSE, TRUE, TRUE); #line 4177 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (file); #line 4177 "/home/jens/Source/shotwell/src/Photo.vala" _photo_file_adapter_unref0 (reader); -#line 30179 "Photo.c" +#line 30215 "Photo.c" } -void photo_get_original_dimensions (Photo* self, Dimensions* result) { +void +photo_get_original_dimensions (Photo* self, + Dimensions* result) +{ Dimensions dim = {0}; Dimensions _tmp0_ = {0}; Orientation orientation = 0; - Orientation _tmp1_; - Dimensions _tmp2_; - Dimensions _tmp3_ = {0}; + Dimensions _tmp1_; + Dimensions _tmp2_ = {0}; #line 4198 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 4199 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30198,42 +30236,44 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) { #line 4199 "/home/jens/Source/shotwell/src/Photo.vala" dim = _tmp0_; #line 4200 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_orientation (self); -#line 4200 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp1_; + orientation = photo_get_orientation (self); #line 4202 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = dim; + _tmp1_ = dim; #line 4202 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_dimensions (orientation, &_tmp2_, &_tmp3_); + orientation_rotate_dimensions (orientation, &_tmp1_, &_tmp2_); #line 4202 "/home/jens/Source/shotwell/src/Photo.vala" - *result = _tmp3_; + *result = _tmp2_; #line 4202 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30208 "Photo.c" +#line 30244 "Photo.c" } -void photo_get_master_dimensions (Photo* self, Dimensions* result) { - Orientation _tmp0_; +void +photo_get_master_dimensions (Photo* self, + Dimensions* result) +{ + Dimensions _tmp0_ = {0}; Dimensions _tmp1_ = {0}; - Dimensions _tmp2_ = {0}; #line 4206 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 4207 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_get_original_orientation (self); -#line 4207 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_raw_dimensions (self, &_tmp1_); + photo_get_raw_dimensions (self, &_tmp0_); #line 4207 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_dimensions (_tmp0_, &_tmp1_, &_tmp2_); + orientation_rotate_dimensions (photo_get_original_orientation (self), &_tmp0_, &_tmp1_); #line 4207 "/home/jens/Source/shotwell/src/Photo.vala" - *result = _tmp2_; + *result = _tmp1_; #line 4207 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 30228 "Photo.c" +#line 30264 "Photo.c" } -gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { +gboolean +photo_get_crop (Photo* self, + Box* crop, + PhotoException exceptions) +{ Box _vala_crop = {0}; gboolean result = FALSE; Box raw = {0}; @@ -30242,9 +30282,6 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { Dimensions dim = {0}; Dimensions _tmp2_ = {0}; Orientation orientation = 0; - Orientation _tmp3_; - PhotoException _tmp4_; - gboolean _tmp5_; #line 4211 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), FALSE); #line 4213 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30261,49 +30298,43 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { if (crop) { #line 4216 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 30260 "Photo.c" +#line 30297 "Photo.c" } #line 4216 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30264 "Photo.c" +#line 30301 "Photo.c" } #line 4219 "/home/jens/Source/shotwell/src/Photo.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_ORIENTATION, &_tmp2_); #line 4219 "/home/jens/Source/shotwell/src/Photo.vala" dim = _tmp2_; #line 4220 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_get_orientation (self); -#line 4220 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp3_; -#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = exceptions; -#line 4222 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_exception_allows (_tmp4_, PHOTO_EXCEPTION_ORIENTATION); + orientation = photo_get_orientation (self); #line 4222 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 30280 "Photo.c" - Orientation _tmp6_; - Dimensions _tmp7_; - Box _tmp8_; - Box _tmp9_ = {0}; + if (photo_exception_allows (exceptions, PHOTO_EXCEPTION_ORIENTATION)) { +#line 30311 "Photo.c" + Orientation _tmp3_; + Dimensions _tmp4_; + Box _tmp5_; + Box _tmp6_ = {0}; #line 4223 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = orientation; + _tmp3_ = orientation; #line 4223 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = dim; + _tmp4_ = dim; #line 4223 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = raw; + _tmp5_ = raw; #line 4223 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_box (_tmp6_, &_tmp7_, &_tmp8_, &_tmp9_); + orientation_rotate_box (_tmp3_, &_tmp4_, &_tmp5_, &_tmp6_); #line 4223 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_crop = _tmp9_; -#line 30295 "Photo.c" + _vala_crop = _tmp6_; +#line 30326 "Photo.c" } else { - Box _tmp10_; + Box _tmp7_; #line 4225 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = raw; + _tmp7_ = raw; #line 4225 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_crop = _tmp10_; -#line 30302 "Photo.c" + _vala_crop = _tmp7_; +#line 30333 "Photo.c" } #line 4227 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -30311,48 +30342,46 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) { if (crop) { #line 4227 "/home/jens/Source/shotwell/src/Photo.vala" *crop = _vala_crop; -#line 30310 "Photo.c" +#line 30341 "Photo.c" } #line 4227 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30314 "Photo.c" +#line 30345 "Photo.c" } -void photo_set_crop (Photo* self, Box* crop) { +void +photo_set_crop (Photo* self, + Box* crop) +{ Dimensions dim = {0}; Dimensions _tmp0_ = {0}; Orientation orientation = 0; - Orientation _tmp1_; Box derotated = {0}; - Dimensions _tmp2_; - Box _tmp3_; - Box _tmp4_ = {0}; - Box _tmp5_; - gint _tmp6_; - Dimensions _tmp7_; - gint _tmp8_; + Dimensions _tmp1_; + Box _tmp2_; + Box _tmp3_ = {0}; + Box _tmp4_; + gint _tmp5_; + Dimensions _tmp6_; + gint _tmp7_; + Box _tmp8_; gint _tmp9_; Box _tmp10_; gint _tmp11_; - Box _tmp12_; + Dimensions _tmp12_; gint _tmp13_; - Dimensions _tmp14_; + Box _tmp14_; gint _tmp15_; - gint _tmp16_; - Box _tmp17_; - gint _tmp18_; - Dimensions _tmp19_; - gint _tmp20_; + Dimensions _tmp16_; + gint _tmp17_; + Box _tmp18_; + gint _tmp19_; + Box _tmp20_; gint _tmp21_; - Box _tmp22_; + Dimensions _tmp22_; gint _tmp23_; Box _tmp24_; - gint _tmp25_; - Dimensions _tmp26_; - gint _tmp27_; - gint _tmp28_; - Box _tmp29_; #line 4231 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 4231 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30362,82 +30391,75 @@ void photo_set_crop (Photo* self, Box* crop) { #line 4232 "/home/jens/Source/shotwell/src/Photo.vala" dim = _tmp0_; #line 4233 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_orientation (self); -#line 4233 "/home/jens/Source/shotwell/src/Photo.vala" - orientation = _tmp1_; + orientation = photo_get_orientation (self); #line 4235 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = dim; + _tmp1_ = dim; #line 4235 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = *crop; + _tmp2_ = *crop; #line 4235 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_derotate_box (orientation, &_tmp2_, &_tmp3_, &_tmp4_); + orientation_derotate_box (orientation, &_tmp1_, &_tmp2_, &_tmp3_); #line 4235 "/home/jens/Source/shotwell/src/Photo.vala" - derotated = _tmp4_; -#line 4237 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = derotated; + derotated = _tmp3_; #line 4237 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_.left; + _tmp4_ = derotated; #line 4237 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = dim; + _tmp5_ = _tmp4_.left; #line 4237 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_.width; + _tmp6_ = dim; #line 4237 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = CLAMP (_tmp6_, 0, _tmp8_ - 2); + _tmp7_ = _tmp6_.width; #line 4237 "/home/jens/Source/shotwell/src/Photo.vala" - derotated.left = _tmp9_; + derotated.left = CLAMP (_tmp5_, 0, _tmp7_ - 2); #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = derotated; -#line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_.right; + _tmp8_ = derotated; #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = derotated; + _tmp9_ = _tmp8_.right; #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _tmp12_.left; + _tmp10_ = derotated; #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = dim; + _tmp11_ = _tmp10_.left; #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_.width; + _tmp12_ = dim; #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = CLAMP (_tmp11_, _tmp13_, _tmp15_ - 1); + _tmp13_ = _tmp12_.width; #line 4238 "/home/jens/Source/shotwell/src/Photo.vala" - derotated.right = _tmp16_; -#line 4240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = derotated; + derotated.right = CLAMP (_tmp9_, _tmp11_, _tmp13_ - 1); #line 4240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_.top; + _tmp14_ = derotated; #line 4240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = dim; + _tmp15_ = _tmp14_.top; #line 4240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_.height; + _tmp16_ = dim; #line 4240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = CLAMP (_tmp18_, 0, _tmp20_ - 2); + _tmp17_ = _tmp16_.height; #line 4240 "/home/jens/Source/shotwell/src/Photo.vala" - derotated.top = _tmp21_; + derotated.top = CLAMP (_tmp15_, 0, _tmp17_ - 2); #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = derotated; + _tmp18_ = derotated; #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_.bottom; + _tmp19_ = _tmp18_.bottom; #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = derotated; -#line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_.top; + _tmp20_ = derotated; #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = dim; + _tmp21_ = _tmp20_.top; #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _tmp26_.height; + _tmp22_ = dim; #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = CLAMP (_tmp23_, _tmp25_, _tmp27_ - 1); + _tmp23_ = _tmp22_.height; #line 4241 "/home/jens/Source/shotwell/src/Photo.vala" - derotated.bottom = _tmp28_; + derotated.bottom = CLAMP (_tmp19_, _tmp21_, _tmp23_ - 1); #line 4243 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = derotated; + _tmp24_ = derotated; #line 4243 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_raw_crop (self, &_tmp29_); -#line 30432 "Photo.c" + photo_set_raw_crop (self, &_tmp24_); +#line 30451 "Photo.c" } -gboolean photo_get_straighten (Photo* self, gdouble* theta) { +gboolean +photo_get_straighten (Photo* self, + gdouble* theta) +{ gdouble _vala_theta = 0.0; gboolean result = FALSE; gdouble _tmp0_ = 0.0; @@ -30456,11 +30478,11 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) { if (theta) { #line 4248 "/home/jens/Source/shotwell/src/Photo.vala" *theta = _vala_theta; -#line 30455 "Photo.c" +#line 30477 "Photo.c" } #line 4248 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30459 "Photo.c" +#line 30481 "Photo.c" } #line 4250 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; @@ -30468,27 +30490,31 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) { if (theta) { #line 4250 "/home/jens/Source/shotwell/src/Photo.vala" *theta = _vala_theta; -#line 30467 "Photo.c" +#line 30489 "Photo.c" } #line 4250 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 30471 "Photo.c" +#line 30493 "Photo.c" } -void photo_set_straighten (Photo* self, gdouble theta) { - gdouble _tmp0_; +void +photo_set_straighten (Photo* self, + gdouble theta) +{ #line 4253 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 4254 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = theta; -#line 4254 "/home/jens/Source/shotwell/src/Photo.vala" - photo_set_raw_straighten (self, _tmp0_); -#line 30483 "Photo.c" + photo_set_raw_straighten (self, theta); +#line 30505 "Photo.c" } -static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsRedeyeInstance* inst) { +static GdkPixbuf* +photo_do_redeye (Photo* self, + GdkPixbuf* pixbuf, + EditingToolsRedeyeInstance* inst) +{ GdkPixbuf* result = NULL; gdouble r = 0.0; EditingToolsRedeyeInstance _tmp0_; @@ -30501,47 +30527,45 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _x_insets_first_quadrant_size_; gint i = 0; gint x_bounds_min = 0; - EditingToolsRedeyeInstance _tmp22_; - GdkPoint _tmp23_; + EditingToolsRedeyeInstance _tmp20_; + GdkPoint _tmp21_; + gint _tmp22_; + EditingToolsRedeyeInstance _tmp23_; gint _tmp24_; - EditingToolsRedeyeInstance _tmp25_; - gint _tmp26_; gint x_bounds_max = 0; - EditingToolsRedeyeInstance _tmp27_; - GdkPoint _tmp28_; + EditingToolsRedeyeInstance _tmp25_; + GdkPoint _tmp26_; + gint _tmp27_; + EditingToolsRedeyeInstance _tmp28_; gint _tmp29_; - EditingToolsRedeyeInstance _tmp30_; - gint _tmp31_; gint ymin = 0; - EditingToolsRedeyeInstance _tmp32_; - GdkPoint _tmp33_; + EditingToolsRedeyeInstance _tmp30_; + GdkPoint _tmp31_; + gint _tmp32_; + EditingToolsRedeyeInstance _tmp33_; gint _tmp34_; - EditingToolsRedeyeInstance _tmp35_; + gint _tmp35_ = 0; gint _tmp36_; - gint _tmp37_ = 0; - gint _tmp38_; gint ymax = 0; - EditingToolsRedeyeInstance _tmp40_; - GdkPoint _tmp41_; + EditingToolsRedeyeInstance _tmp38_; + GdkPoint _tmp39_; + gint _tmp40_; + gint _tmp41_ = 0; gint _tmp42_; - gint _tmp43_ = 0; + gint _tmp43_; gint _tmp44_; - GdkPixbuf* _tmp45_; - gint _tmp46_; - gint _tmp47_; gint inset_index = 0; - EditingToolsRedeyeInstance _tmp88_; - GdkPoint _tmp89_; - gint _tmp90_; - EditingToolsRedeyeInstance _tmp91_; - GdkPoint _tmp92_; - gint _tmp93_; - EditingToolsRedeyeInstance _tmp94_; - gint _tmp95_; - gint* _tmp96_; - gint _tmp96__length1; - GdkPixbuf* _tmp133_; - GdkPixbuf* _tmp134_; + EditingToolsRedeyeInstance _tmp81_; + GdkPoint _tmp82_; + gint _tmp83_; + EditingToolsRedeyeInstance _tmp84_; + GdkPoint _tmp85_; + gint _tmp86_; + EditingToolsRedeyeInstance _tmp87_; + gint _tmp88_; + gint* _tmp89_; + gint _tmp89__length1; + GdkPixbuf* _tmp123_; #line 4257 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 4257 "/home/jens/Source/shotwell/src/Photo.vala" @@ -30568,7 +30592,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _x_insets_first_quadrant_size_ = x_insets_first_quadrant_length1; #line 4270 "/home/jens/Source/shotwell/src/Photo.vala" i = 0; -#line 30567 "Photo.c" +#line 30591 "Photo.c" { gdouble y = 0.0; gdouble _tmp5_; @@ -30576,40 +30600,38 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR _tmp5_ = r; #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" y = _tmp5_; -#line 30575 "Photo.c" +#line 30599 "Photo.c" { gboolean _tmp6_ = FALSE; #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = TRUE; #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30582 "Photo.c" +#line 30606 "Photo.c" gdouble _tmp8_; gdouble theta = 0.0; gdouble _tmp9_; gdouble _tmp10_; - gdouble _tmp11_; gint x = 0; + gdouble _tmp11_; gdouble _tmp12_; - gdouble _tmp13_; - gdouble _tmp14_; - gint* _tmp15_; - gint _tmp15__length1; + gint* _tmp13_; + gint _tmp13__length1; + gint _tmp14_; + EditingToolsRedeyeInstance _tmp15_; gint _tmp16_; - EditingToolsRedeyeInstance _tmp17_; + gint _tmp17_; gint _tmp18_; gint _tmp19_; - gint _tmp20_; - gint _tmp21_; #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp6_) { -#line 30602 "Photo.c" +#line 30624 "Photo.c" gdouble _tmp7_; #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp7_ = y; #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" y = _tmp7_ - 1.0; -#line 30608 "Photo.c" +#line 30630 "Photo.c" } #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" _tmp6_ = FALSE; @@ -30619,392 +30641,382 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR if (!(_tmp8_ >= 0.0)) { #line 4271 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30618 "Photo.c" +#line 30640 "Photo.c" } #line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp9_ = y; #line 4272 "/home/jens/Source/shotwell/src/Photo.vala" _tmp10_ = r; #line 4272 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = asin (_tmp9_ / _tmp10_); -#line 4272 "/home/jens/Source/shotwell/src/Photo.vala" - theta = _tmp11_; + theta = asin (_tmp9_ / _tmp10_); #line 4273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = r; + _tmp11_ = r; #line 4273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = theta; + _tmp12_ = theta; #line 4273 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = cos (_tmp13_); -#line 4273 "/home/jens/Source/shotwell/src/Photo.vala" - x = (gint) ((_tmp12_ * _tmp14_) + 0.5); + x = (gint) ((_tmp11_ * cos (_tmp12_)) + 0.5); #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = x_insets_first_quadrant; + _tmp13_ = x_insets_first_quadrant; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15__length1 = x_insets_first_quadrant_length1; + _tmp13__length1 = x_insets_first_quadrant_length1; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = i; + _tmp14_ = i; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = *inst; + _tmp15_ = *inst; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_.radius; + _tmp16_ = _tmp15_.radius; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = x; + _tmp17_ = x; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_[_tmp16_] = _tmp18_ - _tmp19_; + _tmp13_[_tmp14_] = _tmp16_ - _tmp17_; #line 4274 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp15_[_tmp16_]; + _tmp18_ = _tmp13_[_tmp14_]; #line 4276 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = i; + _tmp19_ = i; #line 4276 "/home/jens/Source/shotwell/src/Photo.vala" - i = _tmp21_ + 1; -#line 30656 "Photo.c" + i = _tmp19_ + 1; +#line 30674 "Photo.c" } } } #line 4279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = *inst; + _tmp20_ = *inst; #line 4279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp22_.center; + _tmp21_ = _tmp20_.center; #line 4279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_.x; + _tmp22_ = _tmp21_.x; #line 4279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = *inst; + _tmp23_ = *inst; #line 4279 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_.radius; + _tmp24_ = _tmp23_.radius; #line 4279 "/home/jens/Source/shotwell/src/Photo.vala" - x_bounds_min = _tmp24_ - _tmp26_; + x_bounds_min = _tmp22_ - _tmp24_; #line 4280 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = *inst; + _tmp25_ = *inst; #line 4280 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp27_.center; + _tmp26_ = _tmp25_.center; #line 4280 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_.x; + _tmp27_ = _tmp26_.x; #line 4280 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = *inst; + _tmp28_ = *inst; #line 4280 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp30_.radius; + _tmp29_ = _tmp28_.radius; #line 4280 "/home/jens/Source/shotwell/src/Photo.vala" - x_bounds_max = _tmp29_ + _tmp31_; + x_bounds_max = _tmp27_ + _tmp29_; #line 4281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = *inst; + _tmp30_ = *inst; #line 4281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_.center; + _tmp31_ = _tmp30_.center; #line 4281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp33_.y; + _tmp32_ = _tmp31_.y; #line 4281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = *inst; + _tmp33_ = *inst; #line 4281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _tmp35_.radius; + _tmp34_ = _tmp33_.radius; #line 4281 "/home/jens/Source/shotwell/src/Photo.vala" - ymin = _tmp34_ - _tmp36_; + ymin = _tmp32_ - _tmp34_; #line 4282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = ymin; + _tmp36_ = ymin; #line 4282 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp38_ < 0) { + if (_tmp36_ < 0) { #line 4282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = 0; -#line 30702 "Photo.c" + _tmp35_ = 0; +#line 30720 "Photo.c" } else { - gint _tmp39_; + gint _tmp37_; #line 4282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = ymin; + _tmp37_ = ymin; #line 4282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp39_; -#line 30709 "Photo.c" + _tmp35_ = _tmp37_; +#line 30727 "Photo.c" } #line 4282 "/home/jens/Source/shotwell/src/Photo.vala" - ymin = _tmp37_; + ymin = _tmp35_; #line 4283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = *inst; + _tmp38_ = *inst; #line 4283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_.center; + _tmp39_ = _tmp38_.center; #line 4283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_.y; + _tmp40_ = _tmp39_.y; #line 4283 "/home/jens/Source/shotwell/src/Photo.vala" - ymax = _tmp42_; + ymax = _tmp40_; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = ymax; + _tmp42_ = ymax; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = pixbuf; + _tmp43_ = gdk_pixbuf_get_height (pixbuf); #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = gdk_pixbuf_get_height (_tmp45_); -#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _tmp46_; + _tmp44_ = _tmp43_; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp44_ > (_tmp47_ - 1)) { -#line 30731 "Photo.c" - GdkPixbuf* _tmp48_; - gint _tmp49_; - gint _tmp50_; + if (_tmp42_ > (_tmp44_ - 1)) { +#line 30747 "Photo.c" + gint _tmp45_; + gint _tmp46_; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = pixbuf; + _tmp45_ = gdk_pixbuf_get_height (pixbuf); #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = gdk_pixbuf_get_height (_tmp48_); + _tmp46_ = _tmp45_; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = _tmp49_; -#line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp50_ - 1; -#line 30743 "Photo.c" + _tmp41_ = _tmp46_ - 1; +#line 30756 "Photo.c" } else { - gint _tmp51_; + gint _tmp47_; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = ymax; + _tmp47_ = ymax; #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _tmp51_; -#line 30750 "Photo.c" + _tmp41_ = _tmp47_; +#line 30763 "Photo.c" } #line 4284 "/home/jens/Source/shotwell/src/Photo.vala" - ymax = _tmp43_; + ymax = _tmp41_; #line 4288 "/home/jens/Source/shotwell/src/Photo.vala" inset_index = 0; -#line 30756 "Photo.c" +#line 30769 "Photo.c" { gint y_it = 0; - gint _tmp52_; + gint _tmp48_; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = ymin; + _tmp48_ = ymin; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - y_it = _tmp52_; -#line 30764 "Photo.c" + y_it = _tmp48_; +#line 30777 "Photo.c" { - gboolean _tmp53_ = FALSE; + gboolean _tmp49_ = FALSE; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = TRUE; + _tmp49_ = TRUE; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30771 "Photo.c" +#line 30784 "Photo.c" + gint _tmp51_; + gint _tmp52_; + gint xmin = 0; + gint _tmp53_; + gint* _tmp54_; + gint _tmp54__length1; gint _tmp55_; gint _tmp56_; - gint xmin = 0; - gint _tmp57_; - gint* _tmp58_; - gint _tmp58__length1; - gint _tmp59_; + gint _tmp57_ = 0; + gint _tmp58_; + gint xmax = 0; gint _tmp60_; - gint _tmp61_ = 0; + gint* _tmp61_; + gint _tmp61__length1; gint _tmp62_; - gint xmax = 0; - gint _tmp64_; - gint* _tmp65_; - gint _tmp65__length1; + gint _tmp63_; + gint _tmp64_ = 0; + gint _tmp65_; gint _tmp66_; gint _tmp67_; - gint _tmp68_ = 0; - gint _tmp69_; - GdkPixbuf* _tmp70_; - gint _tmp71_; - gint _tmp72_; - gint _tmp87_; + gint _tmp80_; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp53_) { -#line 30796 "Photo.c" - gint _tmp54_; + if (!_tmp49_) { +#line 30808 "Photo.c" + gint _tmp50_; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = y_it; + _tmp50_ = y_it; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - y_it = _tmp54_ + 1; -#line 30802 "Photo.c" + y_it = _tmp50_ + 1; +#line 30814 "Photo.c" } #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = FALSE; + _tmp49_ = FALSE; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = y_it; + _tmp51_ = y_it; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = ymax; + _tmp52_ = ymax; #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp55_ <= _tmp56_)) { + if (!(_tmp51_ <= _tmp52_)) { #line 4289 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30814 "Photo.c" +#line 30826 "Photo.c" } #line 4290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = x_bounds_min; + _tmp53_ = x_bounds_min; #line 4290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = x_insets_first_quadrant; + _tmp54_ = x_insets_first_quadrant; #line 4290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58__length1 = x_insets_first_quadrant_length1; + _tmp54__length1 = x_insets_first_quadrant_length1; #line 4290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = inset_index; + _tmp55_ = inset_index; #line 4290 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = _tmp58_[_tmp59_]; + _tmp56_ = _tmp54_[_tmp55_]; #line 4290 "/home/jens/Source/shotwell/src/Photo.vala" - xmin = _tmp57_ + _tmp60_; + xmin = _tmp53_ + _tmp56_; #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = xmin; + _tmp58_ = xmin; #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp62_ < 0) { + if (_tmp58_ < 0) { #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = 0; -#line 30834 "Photo.c" + _tmp57_ = 0; +#line 30846 "Photo.c" } else { - gint _tmp63_; + gint _tmp59_; #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = xmin; + _tmp59_ = xmin; #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _tmp63_; -#line 30841 "Photo.c" + _tmp57_ = _tmp59_; +#line 30853 "Photo.c" } #line 4291 "/home/jens/Source/shotwell/src/Photo.vala" - xmin = _tmp61_; + xmin = _tmp57_; #line 4292 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = x_bounds_max; + _tmp60_ = x_bounds_max; #line 4292 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = x_insets_first_quadrant; + _tmp61_ = x_insets_first_quadrant; #line 4292 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65__length1 = x_insets_first_quadrant_length1; + _tmp61__length1 = x_insets_first_quadrant_length1; #line 4292 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = inset_index; + _tmp62_ = inset_index; #line 4292 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = _tmp65_[_tmp66_]; + _tmp63_ = _tmp61_[_tmp62_]; #line 4292 "/home/jens/Source/shotwell/src/Photo.vala" - xmax = _tmp64_ - _tmp67_; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = xmax; + xmax = _tmp60_ - _tmp63_; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = pixbuf; + _tmp65_ = xmax; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = gdk_pixbuf_get_width (_tmp70_); + _tmp66_ = gdk_pixbuf_get_width (pixbuf); #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_; -#line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp69_ > (_tmp72_ - 1)) { -#line 30867 "Photo.c" - GdkPixbuf* _tmp73_; - gint _tmp74_; - gint _tmp75_; + _tmp67_ = _tmp66_; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = pixbuf; + if (_tmp65_ > (_tmp67_ - 1)) { +#line 30877 "Photo.c" + gint _tmp68_; + gint _tmp69_; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = gdk_pixbuf_get_width (_tmp73_); + _tmp68_ = gdk_pixbuf_get_width (pixbuf); #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = _tmp74_; + _tmp69_ = _tmp68_; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = _tmp75_ - 1; -#line 30879 "Photo.c" + _tmp64_ = _tmp69_ - 1; +#line 30886 "Photo.c" } else { - gint _tmp76_; + gint _tmp70_; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = xmax; + _tmp70_ = xmax; #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = _tmp76_; -#line 30886 "Photo.c" + _tmp64_ = _tmp70_; +#line 30893 "Photo.c" } #line 4293 "/home/jens/Source/shotwell/src/Photo.vala" - xmax = _tmp68_; -#line 30890 "Photo.c" + xmax = _tmp64_; +#line 30897 "Photo.c" { gint x_it = 0; - gint _tmp77_; + gint _tmp71_; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = xmin; + _tmp71_ = xmin; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - x_it = _tmp77_; -#line 30898 "Photo.c" + x_it = _tmp71_; +#line 30905 "Photo.c" { - gboolean _tmp78_ = FALSE; + gboolean _tmp72_ = FALSE; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = TRUE; + _tmp72_ = TRUE; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 30905 "Photo.c" - gint _tmp80_; - gint _tmp81_; - GdkPixbuf* _tmp82_; - gint _tmp83_; - gint _tmp84_; - GdkPixbuf* _tmp85_; - GdkPixbuf* _tmp86_; +#line 30912 "Photo.c" + gint _tmp74_; + gint _tmp75_; + gint _tmp76_; + gint _tmp77_; + GdkPixbuf* _tmp78_; + GdkPixbuf* _tmp79_; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp78_) { -#line 30915 "Photo.c" - gint _tmp79_; + if (!_tmp72_) { +#line 30921 "Photo.c" + gint _tmp73_; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = x_it; + _tmp73_ = x_it; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - x_it = _tmp79_ + 1; -#line 30921 "Photo.c" + x_it = _tmp73_ + 1; +#line 30927 "Photo.c" } #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = FALSE; + _tmp72_ = FALSE; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = x_it; + _tmp74_ = x_it; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = xmax; + _tmp75_ = xmax; #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp80_ <= _tmp81_)) { + if (!(_tmp74_ <= _tmp75_)) { #line 4295 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 30933 "Photo.c" +#line 30939 "Photo.c" } #line 4296 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = pixbuf; -#line 4296 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = x_it; + _tmp76_ = x_it; #line 4296 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = y_it; + _tmp77_ = y_it; #line 4296 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = photo_red_reduce_pixel (self, _tmp82_, _tmp83_, _tmp84_); + _tmp78_ = photo_red_reduce_pixel (self, pixbuf, _tmp76_, _tmp77_); #line 4296 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = _tmp85_; + _tmp79_ = _tmp78_; #line 4296 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp86_); -#line 30947 "Photo.c" + _g_object_unref0 (_tmp79_); +#line 30951 "Photo.c" } } } #line 4298 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = inset_index; + _tmp80_ = inset_index; #line 4298 "/home/jens/Source/shotwell/src/Photo.vala" - inset_index = _tmp87_ + 1; -#line 30955 "Photo.c" + inset_index = _tmp80_ + 1; +#line 30959 "Photo.c" } } } #line 4303 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = *inst; + _tmp81_ = *inst; #line 4303 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = _tmp88_.center; + _tmp82_ = _tmp81_.center; #line 4303 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp89_.y; + _tmp83_ = _tmp82_.y; #line 4303 "/home/jens/Source/shotwell/src/Photo.vala" - ymin = _tmp90_; + ymin = _tmp83_; #line 4304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = *inst; + _tmp84_ = *inst; #line 4304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = _tmp91_.center; + _tmp85_ = _tmp84_.center; #line 4304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = _tmp92_.y; + _tmp86_ = _tmp85_.y; #line 4304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = *inst; + _tmp87_ = *inst; #line 4304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = _tmp94_.radius; + _tmp88_ = _tmp87_.radius; #line 4304 "/home/jens/Source/shotwell/src/Photo.vala" - ymax = _tmp93_ + _tmp95_; + ymax = _tmp86_ + _tmp88_; #line 4305 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = x_insets_first_quadrant; + _tmp89_ = x_insets_first_quadrant; #line 4305 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96__length1 = x_insets_first_quadrant_length1; + _tmp89__length1 = x_insets_first_quadrant_length1; #line 4305 "/home/jens/Source/shotwell/src/Photo.vala" - inset_index = _tmp96__length1 - 1; -#line 30985 "Photo.c" + inset_index = _tmp89__length1 - 1; +#line 30989 "Photo.c" { gint y_it = 0; - gint _tmp97_; + gint _tmp90_; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = ymin; + _tmp90_ = ymin; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - y_it = _tmp97_; -#line 30993 "Photo.c" + y_it = _tmp90_; +#line 30997 "Photo.c" { - gboolean _tmp98_ = FALSE; + gboolean _tmp91_ = FALSE; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = TRUE; + _tmp91_ = TRUE; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 31000 "Photo.c" - gint _tmp100_; - gint _tmp101_; +#line 31004 "Photo.c" + gint _tmp93_; + gint _tmp94_; gint xmin = 0; + gint _tmp95_; + gint* _tmp96_; + gint _tmp96__length1; + gint _tmp97_; + gint _tmp98_; + gint _tmp99_ = 0; + gint _tmp100_; + gint xmax = 0; gint _tmp102_; gint* _tmp103_; gint _tmp103__length1; @@ -31012,477 +31024,425 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR gint _tmp105_; gint _tmp106_ = 0; gint _tmp107_; - gint xmax = 0; + gint _tmp108_; gint _tmp109_; - gint* _tmp110_; - gint _tmp110__length1; - gint _tmp111_; - gint _tmp112_; - gint _tmp113_ = 0; - gint _tmp114_; - GdkPixbuf* _tmp115_; - gint _tmp116_; - gint _tmp117_; - gint _tmp132_; + gint _tmp122_; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp98_) { -#line 31025 "Photo.c" - gint _tmp99_; + if (!_tmp91_) { +#line 31028 "Photo.c" + gint _tmp92_; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = y_it; + _tmp92_ = y_it; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - y_it = _tmp99_ + 1; -#line 31031 "Photo.c" + y_it = _tmp92_ + 1; +#line 31034 "Photo.c" } #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = FALSE; + _tmp91_ = FALSE; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = y_it; + _tmp93_ = y_it; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = ymax; + _tmp94_ = ymax; #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp100_ <= _tmp101_)) { + if (!(_tmp93_ <= _tmp94_)) { #line 4306 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 31043 "Photo.c" +#line 31046 "Photo.c" } #line 4307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = x_bounds_min; + _tmp95_ = x_bounds_min; #line 4307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = x_insets_first_quadrant; + _tmp96_ = x_insets_first_quadrant; #line 4307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103__length1 = x_insets_first_quadrant_length1; + _tmp96__length1 = x_insets_first_quadrant_length1; #line 4307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = inset_index; + _tmp97_ = inset_index; #line 4307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = _tmp103_[_tmp104_]; + _tmp98_ = _tmp96_[_tmp97_]; #line 4307 "/home/jens/Source/shotwell/src/Photo.vala" - xmin = _tmp102_ + _tmp105_; + xmin = _tmp95_ + _tmp98_; #line 4308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = xmin; + _tmp100_ = xmin; #line 4308 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp107_ < 0) { + if (_tmp100_ < 0) { #line 4308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = 0; -#line 31063 "Photo.c" + _tmp99_ = 0; +#line 31066 "Photo.c" } else { - gint _tmp108_; + gint _tmp101_; #line 4308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp108_ = xmin; + _tmp101_ = xmin; #line 4308 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = _tmp108_; -#line 31070 "Photo.c" + _tmp99_ = _tmp101_; +#line 31073 "Photo.c" } #line 4308 "/home/jens/Source/shotwell/src/Photo.vala" - xmin = _tmp106_; + xmin = _tmp99_; #line 4309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_ = x_bounds_max; + _tmp102_ = x_bounds_max; #line 4309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_ = x_insets_first_quadrant; + _tmp103_ = x_insets_first_quadrant; #line 4309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110__length1 = x_insets_first_quadrant_length1; + _tmp103__length1 = x_insets_first_quadrant_length1; #line 4309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp111_ = inset_index; + _tmp104_ = inset_index; #line 4309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_ = _tmp110_[_tmp111_]; + _tmp105_ = _tmp103_[_tmp104_]; #line 4309 "/home/jens/Source/shotwell/src/Photo.vala" - xmax = _tmp109_ - _tmp112_; + xmax = _tmp102_ - _tmp105_; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = xmax; + _tmp107_ = xmax; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_ = pixbuf; + _tmp108_ = gdk_pixbuf_get_width (pixbuf); #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_ = gdk_pixbuf_get_width (_tmp115_); + _tmp109_ = _tmp108_; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp117_ = _tmp116_; + if (_tmp107_ > (_tmp109_ - 1)) { +#line 31097 "Photo.c" + gint _tmp110_; + gint _tmp111_; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp114_ > (_tmp117_ - 1)) { -#line 31096 "Photo.c" - GdkPixbuf* _tmp118_; - gint _tmp119_; - gint _tmp120_; + _tmp110_ = gdk_pixbuf_get_width (pixbuf); #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_ = pixbuf; + _tmp111_ = _tmp110_; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp119_ = gdk_pixbuf_get_width (_tmp118_); -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_ = _tmp119_; -#line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = _tmp120_ - 1; -#line 31108 "Photo.c" + _tmp106_ = _tmp111_ - 1; +#line 31106 "Photo.c" } else { - gint _tmp121_; + gint _tmp112_; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp121_ = xmax; + _tmp112_ = xmax; #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = _tmp121_; -#line 31115 "Photo.c" + _tmp106_ = _tmp112_; +#line 31113 "Photo.c" } #line 4310 "/home/jens/Source/shotwell/src/Photo.vala" - xmax = _tmp113_; -#line 31119 "Photo.c" + xmax = _tmp106_; +#line 31117 "Photo.c" { gint x_it = 0; - gint _tmp122_; + gint _tmp113_; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp122_ = xmin; + _tmp113_ = xmin; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - x_it = _tmp122_; -#line 31127 "Photo.c" + x_it = _tmp113_; +#line 31125 "Photo.c" { - gboolean _tmp123_ = FALSE; + gboolean _tmp114_ = FALSE; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp123_ = TRUE; + _tmp114_ = TRUE; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 31134 "Photo.c" - gint _tmp125_; - gint _tmp126_; - GdkPixbuf* _tmp127_; - gint _tmp128_; - gint _tmp129_; - GdkPixbuf* _tmp130_; - GdkPixbuf* _tmp131_; +#line 31132 "Photo.c" + gint _tmp116_; + gint _tmp117_; + gint _tmp118_; + gint _tmp119_; + GdkPixbuf* _tmp120_; + GdkPixbuf* _tmp121_; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp123_) { -#line 31144 "Photo.c" - gint _tmp124_; + if (!_tmp114_) { +#line 31141 "Photo.c" + gint _tmp115_; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_ = x_it; + _tmp115_ = x_it; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - x_it = _tmp124_ + 1; -#line 31150 "Photo.c" + x_it = _tmp115_ + 1; +#line 31147 "Photo.c" } #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp123_ = FALSE; + _tmp114_ = FALSE; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp125_ = x_it; + _tmp116_ = x_it; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126_ = xmax; + _tmp117_ = xmax; #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp125_ <= _tmp126_)) { + if (!(_tmp116_ <= _tmp117_)) { #line 4312 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 31162 "Photo.c" +#line 31159 "Photo.c" } #line 4313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp127_ = pixbuf; -#line 4313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp128_ = x_it; + _tmp118_ = x_it; #line 4313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp129_ = y_it; + _tmp119_ = y_it; #line 4313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp130_ = photo_red_reduce_pixel (self, _tmp127_, _tmp128_, _tmp129_); + _tmp120_ = photo_red_reduce_pixel (self, pixbuf, _tmp118_, _tmp119_); #line 4313 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp131_ = _tmp130_; + _tmp121_ = _tmp120_; #line 4313 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp131_); -#line 31176 "Photo.c" + _g_object_unref0 (_tmp121_); +#line 31171 "Photo.c" } } } #line 4315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp132_ = inset_index; + _tmp122_ = inset_index; #line 4315 "/home/jens/Source/shotwell/src/Photo.vala" - inset_index = _tmp132_ - 1; -#line 31184 "Photo.c" + inset_index = _tmp122_ - 1; +#line 31179 "Photo.c" } } } #line 4318 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp133_ = pixbuf; + _tmp123_ = _g_object_ref0 (pixbuf); #line 4318 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp134_ = _g_object_ref0 (_tmp133_); -#line 4318 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp134_; + result = _tmp123_; #line 4318 "/home/jens/Source/shotwell/src/Photo.vala" x_insets_first_quadrant = (g_free (x_insets_first_quadrant), NULL); #line 4318 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31198 "Photo.c" +#line 31191 "Photo.c" } -static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x, gint y) { +static GdkPixbuf* +photo_red_reduce_pixel (Photo* self, + GdkPixbuf* pixbuf, + gint x, + gint y) +{ GdkPixbuf* result = NULL; gint px_start_byte_offset = 0; - gint _tmp0_; - GdkPixbuf* _tmp1_; - gint _tmp2_; - gint _tmp3_; - GdkPixbuf* _tmp4_; - gint _tmp5_; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; - gint _tmp9_; - GdkPixbuf* _tmp33_; - GdkPixbuf* _tmp34_; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; + gboolean _tmp2_ = FALSE; + GdkPixbuf* _tmp20_; #line 4321 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (self), NULL); #line 4321 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); #line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = y; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = pixbuf; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gdk_pixbuf_get_rowstride (_tmp1_); -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = x; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = pixbuf; -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_); -#line 4322 "/home/jens/Source/shotwell/src/Photo.vala" - px_start_byte_offset = (_tmp0_ * _tmp2_) + (_tmp3_ * _tmp5_); -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = x; + px_start_byte_offset = (y * gdk_pixbuf_get_rowstride (pixbuf)) + (x * gdk_pixbuf_get_n_channels (pixbuf)); #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp9_ >= 0) { -#line 31239 "Photo.c" - gint _tmp10_; + if (x >= 0) { #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = y; -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp10_ >= 0; -#line 31245 "Photo.c" + _tmp2_ = y >= 0; +#line 31217 "Photo.c" } else { #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = FALSE; -#line 31249 "Photo.c" + _tmp2_ = FALSE; +#line 31221 "Photo.c" } #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { -#line 31253 "Photo.c" - gint _tmp11_; - GdkPixbuf* _tmp12_; - gint _tmp13_; - gint _tmp14_; -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = x; -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = pixbuf; + if (_tmp2_) { +#line 31225 "Photo.c" + gint _tmp3_; + gint _tmp4_; #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = gdk_pixbuf_get_width (_tmp12_); + _tmp3_ = gdk_pixbuf_get_width (pixbuf); #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_; + _tmp4_ = _tmp3_; #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp11_ < _tmp14_; -#line 31268 "Photo.c" + _tmp1_ = x < _tmp4_; +#line 31234 "Photo.c" } else { #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = FALSE; -#line 31272 "Photo.c" + _tmp1_ = FALSE; +#line 31238 "Photo.c" } #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_) { -#line 31276 "Photo.c" - gint _tmp15_; - GdkPixbuf* _tmp16_; - gint _tmp17_; - gint _tmp18_; -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = y; -#line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = pixbuf; + if (_tmp1_) { +#line 31242 "Photo.c" + gint _tmp5_; + gint _tmp6_; #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = gdk_pixbuf_get_height (_tmp16_); + _tmp5_ = gdk_pixbuf_get_height (pixbuf); #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_; + _tmp6_ = _tmp5_; #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp15_ < _tmp18_; -#line 31291 "Photo.c" + _tmp0_ = y < _tmp6_; +#line 31251 "Photo.c" } else { #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = FALSE; -#line 31295 "Photo.c" + _tmp0_ = FALSE; +#line 31255 "Photo.c" } #line 4329 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { -#line 31299 "Photo.c" + if (_tmp0_) { +#line 31259 "Photo.c" guchar* pixel_data = NULL; - GdkPixbuf* _tmp19_; - guint8* _tmp20_; + guint8* _tmp7_; gint pixel_data_length1; gint _pixel_data_size_; guchar g = '\0'; - guchar* _tmp21_; - gint _tmp21__length1; - gint _tmp22_; - guchar _tmp23_; + guchar* _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + guchar _tmp10_; guchar b = '\0'; - guchar* _tmp24_; - gint _tmp24__length1; - gint _tmp25_; - guchar _tmp26_; + guchar* _tmp11_; + gint _tmp11__length1; + gint _tmp12_; + guchar _tmp13_; guchar r = '\0'; - guchar _tmp27_; - guchar _tmp28_; - guchar* _tmp29_; - gint _tmp29__length1; - gint _tmp30_; - guchar _tmp31_; - guchar _tmp32_; -#line 4330 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = pixbuf; + guchar _tmp14_; + guchar _tmp15_; + guchar* _tmp16_; + gint _tmp16__length1; + gint _tmp17_; + guchar _tmp18_; + guchar _tmp19_; #line 4330 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = gdk_pixbuf_get_pixels (_tmp19_); + _tmp7_ = gdk_pixbuf_get_pixels (pixbuf); #line 4330 "/home/jens/Source/shotwell/src/Photo.vala" - pixel_data = _tmp20_; + pixel_data = _tmp7_; #line 4330 "/home/jens/Source/shotwell/src/Photo.vala" pixel_data_length1 = -1; #line 4330 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_data_size_ = pixel_data_length1; #line 4340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = pixel_data; + _tmp8_ = pixel_data; #line 4340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21__length1 = pixel_data_length1; + _tmp8__length1 = pixel_data_length1; #line 4340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = px_start_byte_offset; + _tmp9_ = px_start_byte_offset; #line 4340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _tmp21_[_tmp22_ + 1]; + _tmp10_ = _tmp8_[_tmp9_ + 1]; #line 4340 "/home/jens/Source/shotwell/src/Photo.vala" - g = _tmp23_; + g = _tmp10_; #line 4341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = pixel_data; + _tmp11_ = pixel_data; #line 4341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24__length1 = pixel_data_length1; + _tmp11__length1 = pixel_data_length1; #line 4341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = px_start_byte_offset; + _tmp12_ = px_start_byte_offset; #line 4341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp24_[_tmp25_ + 2]; + _tmp13_ = _tmp11_[_tmp12_ + 2]; #line 4341 "/home/jens/Source/shotwell/src/Photo.vala" - b = _tmp26_; + b = _tmp13_; #line 4343 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = g; + _tmp14_ = g; #line 4343 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = b; + _tmp15_ = b; #line 4343 "/home/jens/Source/shotwell/src/Photo.vala" - r = (guchar) ((_tmp27_ + _tmp28_) / 2); + r = (guchar) ((_tmp14_ + _tmp15_) / 2); #line 4345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = pixel_data; + _tmp16_ = pixel_data; #line 4345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29__length1 = pixel_data_length1; + _tmp16__length1 = pixel_data_length1; #line 4345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = px_start_byte_offset; + _tmp17_ = px_start_byte_offset; #line 4345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = r; + _tmp18_ = r; #line 4345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_[_tmp30_] = _tmp31_; + _tmp16_[_tmp17_] = _tmp18_; #line 4345 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp29_[_tmp30_]; -#line 31371 "Photo.c" + _tmp19_ = _tmp16_[_tmp17_]; +#line 31328 "Photo.c" } #line 4348 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = pixbuf; + _tmp20_ = _g_object_ref0 (pixbuf); #line 4348 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _g_object_ref0 (_tmp33_); -#line 4348 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp34_; + result = _tmp20_; #line 4348 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31381 "Photo.c" +#line 31336 "Photo.c" } -void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoint* result) { +void +photo_unscaled_to_raw_point (Photo* self, + GdkPoint* unscaled_point, + GdkPoint* result) +{ Orientation unscaled_orientation = 0; - Orientation _tmp0_; Dimensions unscaled_dims = {0}; - Orientation _tmp1_; + Orientation _tmp0_; + Dimensions _tmp1_ = {0}; Dimensions _tmp2_ = {0}; - Dimensions _tmp3_ = {0}; gint unscaled_x_offset_raw = 0; gint unscaled_y_offset_raw = 0; Box crop_box = {0}; - Box _tmp4_ = {0}; - gboolean _tmp5_; + Box _tmp3_ = {0}; + gboolean _tmp4_; GdkPoint derotated_point = {0}; - Orientation _tmp10_; - Dimensions _tmp11_; - GdkPoint _tmp12_; - GdkPoint _tmp13_ = {0}; + Orientation _tmp9_; + Dimensions _tmp10_; + GdkPoint _tmp11_; + GdkPoint _tmp12_ = {0}; + gint _tmp13_; gint _tmp14_; gint _tmp15_; gint _tmp16_; - gint _tmp17_; #line 4351 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (self)); #line 4351 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (unscaled_point != NULL); #line 4352 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_get_orientation (self); -#line 4352 "/home/jens/Source/shotwell/src/Photo.vala" - unscaled_orientation = _tmp0_; + unscaled_orientation = photo_get_orientation (self); #line 4354 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = unscaled_orientation; + _tmp0_ = unscaled_orientation; #line 4354 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp2_); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp1_); #line 4354 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_rotate_dimensions (_tmp1_, &_tmp2_, &_tmp3_); + orientation_rotate_dimensions (_tmp0_, &_tmp1_, &_tmp2_); #line 4354 "/home/jens/Source/shotwell/src/Photo.vala" - unscaled_dims = _tmp3_; + unscaled_dims = _tmp2_; #line 4357 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_x_offset_raw = 0; #line 4358 "/home/jens/Source/shotwell/src/Photo.vala" unscaled_y_offset_raw = 0; #line 4361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_get_raw_crop (self, &_tmp4_); + _tmp4_ = photo_get_raw_crop (self, &_tmp3_); #line 4361 "/home/jens/Source/shotwell/src/Photo.vala" - crop_box = _tmp4_; + crop_box = _tmp3_; #line 4361 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 31432 "Photo.c" - Box _tmp6_; - gint _tmp7_; - Box _tmp8_; - gint _tmp9_; + if (_tmp4_) { +#line 31388 "Photo.c" + Box _tmp5_; + gint _tmp6_; + Box _tmp7_; + gint _tmp8_; #line 4362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = crop_box; + _tmp5_ = crop_box; #line 4362 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_.left; + _tmp6_ = _tmp5_.left; #line 4362 "/home/jens/Source/shotwell/src/Photo.vala" - unscaled_x_offset_raw = _tmp7_; + unscaled_x_offset_raw = _tmp6_; #line 4363 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = crop_box; + _tmp7_ = crop_box; #line 4363 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_.top; + _tmp8_ = _tmp7_.top; #line 4363 "/home/jens/Source/shotwell/src/Photo.vala" - unscaled_y_offset_raw = _tmp9_; -#line 31449 "Photo.c" + unscaled_y_offset_raw = _tmp8_; +#line 31405 "Photo.c" } #line 4366 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = unscaled_orientation; + _tmp9_ = unscaled_orientation; #line 4366 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = unscaled_dims; + _tmp10_ = unscaled_dims; #line 4366 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = *unscaled_point; + _tmp11_ = *unscaled_point; #line 4366 "/home/jens/Source/shotwell/src/Photo.vala" - orientation_derotate_point (_tmp10_, &_tmp11_, &_tmp12_, &_tmp13_); + orientation_derotate_point (_tmp9_, &_tmp10_, &_tmp11_, &_tmp12_); #line 4366 "/home/jens/Source/shotwell/src/Photo.vala" - derotated_point = _tmp13_; + derotated_point = _tmp12_; #line 4370 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = derotated_point.x; + _tmp13_ = derotated_point.x; #line 4370 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = unscaled_x_offset_raw; + _tmp14_ = unscaled_x_offset_raw; #line 4370 "/home/jens/Source/shotwell/src/Photo.vala" - derotated_point.x = _tmp14_ + _tmp15_; + derotated_point.x = _tmp13_ + _tmp14_; #line 4371 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = derotated_point.y; + _tmp15_ = derotated_point.y; #line 4371 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = unscaled_y_offset_raw; + _tmp16_ = unscaled_y_offset_raw; #line 4371 "/home/jens/Source/shotwell/src/Photo.vala" - derotated_point.y = _tmp16_ + _tmp17_; + derotated_point.y = _tmp15_ + _tmp16_; #line 4373 "/home/jens/Source/shotwell/src/Photo.vala" *result = derotated_point; #line 4373 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 31477 "Photo.c" +#line 31433 "Photo.c" } -void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRectangle* result) { +void +photo_unscaled_to_raw_rect (Photo* self, + GdkRectangle* unscaled_rect, + GdkRectangle* result) +{ GdkPoint upper_left = {0}; GdkPoint _tmp0_ = {0}; GdkPoint lower_right = {0}; @@ -31590,7 +31550,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe _tmp21_ = _tmp20_.x; #line 4387 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp19_ > _tmp21_) { -#line 31589 "Photo.c" +#line 31549 "Photo.c" gint temp = 0; GdkPoint _tmp22_; gint _tmp23_; @@ -31613,7 +31573,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe _tmp26_ = temp; #line 4390 "/home/jens/Source/shotwell/src/Photo.vala" lower_right.x = _tmp26_; -#line 31612 "Photo.c" +#line 31572 "Photo.c" } #line 4392 "/home/jens/Source/shotwell/src/Photo.vala" _tmp27_ = upper_left; @@ -31625,7 +31585,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe _tmp30_ = _tmp29_.y; #line 4392 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp28_ > _tmp30_) { -#line 31624 "Photo.c" +#line 31584 "Photo.c" gint temp = 0; GdkPoint _tmp31_; gint _tmp32_; @@ -31648,7 +31608,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe _tmp35_ = temp; #line 4395 "/home/jens/Source/shotwell/src/Photo.vala" lower_right.y = _tmp35_; -#line 31647 "Photo.c" +#line 31607 "Photo.c" } #line 4398 "/home/jens/Source/shotwell/src/Photo.vala" memset (&raw_rect, 0, sizeof (GdkRectangle)); @@ -31688,11 +31648,13 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe *result = raw_rect; #line 4404 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 31687 "Photo.c" +#line 31647 "Photo.c" } -PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { +PixelTransformationBundle* +photo_get_enhance_transformations (Photo* self) +{ PixelTransformationBundle* result = NULL; GdkPixbuf* pixbuf = NULL; PixelTransformationBundle* transformations = NULL; @@ -31703,7 +31665,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { g_return_val_if_fail (IS_PHOTO (self), NULL); #line 4408 "/home/jens/Source/shotwell/src/Photo.vala" pixbuf = NULL; -#line 31702 "Photo.c" +#line 31664 "Photo.c" { GdkPixbuf* _tmp0_ = NULL; Scaling _tmp1_ = {0}; @@ -31717,7 +31679,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { _tmp0_ = _tmp2_; #line 4415 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 31716 "Photo.c" +#line 31678 "Photo.c" goto __catch417_g_error; } #line 4415 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31730,7 +31692,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { pixbuf = _tmp3_; #line 4414 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); -#line 31729 "Photo.c" +#line 31691 "Photo.c" } goto __finally417; __catch417_g_error: @@ -31750,7 +31712,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { _g_object_unref0 (pixbuf); #line 4424 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31749 "Photo.c" +#line 31711 "Photo.c" } __finally417: #line 4414 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31763,7 +31725,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { g_clear_error (&_inner_error_); #line 4414 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 31762 "Photo.c" +#line 31724 "Photo.c" } #line 4431 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = pixbuf; @@ -31777,11 +31739,13 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) { _g_object_unref0 (pixbuf); #line 4439 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31776 "Photo.c" +#line 31738 "Photo.c" } -gboolean photo_enhance (Photo* self) { +gboolean +photo_enhance (Photo* self) +{ gboolean result = FALSE; PixelTransformationBundle* transformations = NULL; PixelTransformationBundle* _tmp0_; @@ -31803,7 +31767,7 @@ gboolean photo_enhance (Photo* self) { _pixel_transformation_bundle_unref0 (transformations); #line 4446 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31802 "Photo.c" +#line 31766 "Photo.c" } { PhotoRow* _tmp2_; @@ -31811,14 +31775,14 @@ gboolean photo_enhance (Photo* self) { _tmp2_ = self->row; #line 4451 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_lock (&self->priv->__lock_row); -#line 31810 "Photo.c" +#line 31774 "Photo.c" { PixelTransformationBundle* _tmp3_; #line 4452 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = transformations; #line 4452 "/home/jens/Source/shotwell/src/Photo.vala" photo_set_color_adjustments (self, _tmp3_); -#line 31817 "Photo.c" +#line 31781 "Photo.c" } __finally418: { @@ -31827,11 +31791,11 @@ gboolean photo_enhance (Photo* self) { _tmp4_ = self->row; #line 4451 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_unlock (&self->priv->__lock_row); -#line 31826 "Photo.c" +#line 31790 "Photo.c" } #line 4451 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 31830 "Photo.c" +#line 31794 "Photo.c" gboolean _tmp5_ = FALSE; #line 4451 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (transformations); @@ -31841,7 +31805,7 @@ gboolean photo_enhance (Photo* self) { g_clear_error (&_inner_error_); #line 4451 "/home/jens/Source/shotwell/src/Photo.vala" return _tmp5_; -#line 31840 "Photo.c" +#line 31804 "Photo.c" } } #line 4459 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31850,11 +31814,13 @@ gboolean photo_enhance (Photo* self) { _pixel_transformation_bundle_unref0 (transformations); #line 4459 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31849 "Photo.c" +#line 31813 "Photo.c" } -gboolean photo_get_develop_raw_photos_to_files (void) { +gboolean +photo_get_develop_raw_photos_to_files (void) +{ gboolean result; gboolean _tmp0_; #line 349 "/home/jens/Source/shotwell/src/Photo.vala" @@ -31863,30 +31829,40 @@ gboolean photo_get_develop_raw_photos_to_files (void) { result = _tmp0_; #line 349 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 31862 "Photo.c" +#line 31828 "Photo.c" } -void photo_set_develop_raw_photos_to_files (gboolean value) { - gboolean _tmp0_; -#line 349 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = value; +void +photo_set_develop_raw_photos_to_files (gboolean value) +{ #line 349 "/home/jens/Source/shotwell/src/Photo.vala" - photo__develop_raw_photos_to_files = _tmp0_; -#line 31872 "Photo.c" + photo__develop_raw_photos_to_files = value; +#line 31837 "Photo.c" } -static void photo_real_editable_replaced (Photo* self, GFile* old_file, GFile* new_file) { +static void +photo_real_editable_replaced (Photo* self, + GFile* old_file, + GFile* new_file) +{ #line 358 "/home/jens/Source/shotwell/src/Photo.vala" 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 31881 "Photo.c" +#line 31850 "Photo.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT callback; register GCClosure * cc; @@ -31901,38 +31877,52 @@ 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 31900 "Photo.c" +#line 31876 "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 31906 "Photo.c" +#line 31882 "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 31912 "Photo.c" +#line 31888 "Photo.c" } -static void photo_real_raw_development_modified (Photo* self) { +static void +photo_real_raw_development_modified (Photo* self) +{ } -static void photo_real_baseline_replaced (Photo* self) { +static void +photo_real_baseline_replaced (Photo* self) +{ } -static void photo_real_master_reimported (Photo* self, PhotoMetadata* metadata) { +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 31927 "Photo.c" +#line 31910 "Photo.c" } -static void g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__MEDIA_METADATA) (gpointer data1, gpointer arg_1, gpointer data2); register GMarshalFunc_VOID__MEDIA_METADATA callback; register GCClosure * cc; @@ -31947,62 +31937,75 @@ 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 31946 "Photo.c" +#line 31936 "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 31952 "Photo.c" +#line 31942 "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 31958 "Photo.c" +#line 31948 "Photo.c" } -static void photo_real_editable_reimported (Photo* self, PhotoMetadata* metadata) { +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 31965 "Photo.c" +#line 31958 "Photo.c" } -static void photo_real_baseline_reimported (Photo* self, PhotoMetadata* metadata) { +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 31972 "Photo.c" +#line 31968 "Photo.c" } -static void photo_real_source_reimported (Photo* self, PhotoMetadata* metadata) { +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 31979 "Photo.c" +#line 31978 "Photo.c" } -static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, gpointer self) { +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 31986 "Photo.c" +#line 31988 "Photo.c" } -static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_construct (GType object_type, Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments) { +static PhotoPhotoTransformationStateImpl* +photo_photo_transformation_state_impl_construct (GType object_type, + Photo* photo, + Orientation orientation, + GeeHashMap* transformations, + PixelTransformer* transformer, + PixelTransformationBundle* adjustments) +{ PhotoPhotoTransformationStateImpl * self = NULL; Photo* _tmp0_; - Photo* _tmp1_; - Orientation _tmp2_; - GeeHashMap* _tmp3_; - GeeHashMap* _tmp4_; - PixelTransformer* _tmp5_; - PixelTransformer* _tmp6_; - PixelTransformationBundle* _tmp7_; - PixelTransformationBundle* _tmp8_; - Photo* _tmp9_; + GeeHashMap* _tmp1_; + PixelTransformer* _tmp2_; + PixelTransformationBundle* _tmp3_; #line 244 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 244 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32014,59 +32017,55 @@ static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_ #line 244 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoPhotoTransformationStateImpl*) photo_transformation_state_construct (object_type); #line 247 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 247 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (photo); #line 247 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->photo); #line 247 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->photo = _tmp1_; -#line 248 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = orientation; + self->priv->photo = _tmp0_; #line 248 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->orientation = _tmp2_; + self->priv->orientation = orientation; #line 249 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = transformations; -#line 249 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo_photo_transformation_state_impl_copy_transformations (_tmp3_); + _tmp1_ = photo_photo_transformation_state_impl_copy_transformations (transformations); #line 249 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->transformations); #line 249 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->transformations = _tmp4_; -#line 250 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = transformer; + self->priv->transformations = _tmp1_; #line 250 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _pixel_transformer_ref0 (_tmp5_); + _tmp2_ = _pixel_transformer_ref0 (transformer); #line 250 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformer_unref0 (self->priv->transformer); #line 250 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->transformer = _tmp6_; + self->priv->transformer = _tmp2_; #line 251 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = adjustments; -#line 251 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _pixel_transformation_bundle_ref0 (_tmp7_); + _tmp3_ = _pixel_transformation_bundle_ref0 (adjustments); #line 251 "/home/jens/Source/shotwell/src/Photo.vala" _pixel_transformation_bundle_unref0 (self->priv->adjustments); #line 251 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->adjustments = _tmp8_; -#line 253 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo; + self->priv->adjustments = _tmp3_; #line 253 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_connect_object (_tmp9_, "baseline-replaced", (GCallback) _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced, self, 0); + g_signal_connect_object (photo, "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 32054 "Photo.c" +#line 32045 "Photo.c" } -static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_new (Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments) { +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 32061 "Photo.c" +#line 32058 "Photo.c" } -static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoPhotoTransformationStateImpl* self) { +static Orientation +photo_photo_transformation_state_impl_get_orientation (PhotoPhotoTransformationStateImpl* self) +{ Orientation result = 0; Orientation _tmp0_; #line 260 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32077,11 +32076,13 @@ static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoP result = _tmp0_; #line 261 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32076 "Photo.c" +#line 32075 "Photo.c" } -static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (PhotoPhotoTransformationStateImpl* self) { +static GeeHashMap* +photo_photo_transformation_state_impl_get_transformations (PhotoPhotoTransformationStateImpl* self) +{ GeeHashMap* result = NULL; GeeHashMap* _tmp0_; GeeHashMap* _tmp1_; @@ -32095,11 +32096,13 @@ static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (Ph result = _tmp1_; #line 265 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32094 "Photo.c" +#line 32095 "Photo.c" } -static PixelTransformer* photo_photo_transformation_state_impl_get_transformer (PhotoPhotoTransformationStateImpl* self) { +static PixelTransformer* +photo_photo_transformation_state_impl_get_transformer (PhotoPhotoTransformationStateImpl* self) +{ PixelTransformer* result = NULL; PixelTransformer* _tmp0_ = NULL; PixelTransformer* _tmp1_; @@ -32109,7 +32112,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 32108 "Photo.c" +#line 32111 "Photo.c" PixelTransformer* _tmp2_; PixelTransformer* _tmp3_; #line 269 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32120,23 +32123,25 @@ 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 32119 "Photo.c" +#line 32122 "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 32125 "Photo.c" +#line 32128 "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 32131 "Photo.c" +#line 32134 "Photo.c" } -static PixelTransformationBundle* photo_photo_transformation_state_impl_get_color_adjustments (PhotoPhotoTransformationStateImpl* self) { +static PixelTransformationBundle* +photo_photo_transformation_state_impl_get_color_adjustments (PhotoPhotoTransformationStateImpl* self) +{ PixelTransformationBundle* result = NULL; PixelTransformationBundle* _tmp0_ = NULL; PixelTransformationBundle* _tmp1_; @@ -32146,7 +32151,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 32145 "Photo.c" +#line 32150 "Photo.c" PixelTransformationBundle* _tmp2_; PixelTransformationBundle* _tmp3_; #line 273 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32157,172 +32162,167 @@ 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 32156 "Photo.c" +#line 32161 "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 32162 "Photo.c" +#line 32167 "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 32168 "Photo.c" +#line 32173 "Photo.c" } -static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (GeeHashMap* original) { +static GeeHashMap* +photo_photo_transformation_state_impl_copy_transformations (GeeHashMap* original) +{ GeeHashMap* result = NULL; - GeeHashMap* _tmp0_; GeeHashMap* clone = NULL; - GeeHashMap* _tmp1_; + GeeHashMap* _tmp0_; #line 276 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((original == NULL) || GEE_IS_HASH_MAP (original), NULL); #line 278 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = original; -#line 278 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ == NULL) { + if (original == NULL) { #line 279 "/home/jens/Source/shotwell/src/Photo.vala" result = NULL; #line 279 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 32187 "Photo.c" +#line 32191 "Photo.c" } #line 281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 281 "/home/jens/Source/shotwell/src/Photo.vala" - clone = _tmp1_; -#line 32193 "Photo.c" + clone = _tmp0_; +#line 32197 "Photo.c" { GeeIterator* _object_it = NULL; - GeeHashMap* _tmp2_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; GeeSet* _tmp3_; - GeeSet* _tmp4_; - GeeSet* _tmp5_; - GeeIterator* _tmp6_; - GeeIterator* _tmp7_; -#line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = original; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (original, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp3_); #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _object_it = _tmp7_; + _object_it = _tmp5_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 32220 "Photo.c" - GeeIterator* _tmp8_; - gboolean _tmp9_; +#line 32221 "Photo.c" + GeeIterator* _tmp6_; gchar* object = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - GeeHashMap* _tmp12_; - const gchar* _tmp13_; - GeeHashMap* _tmp14_; - const gchar* _tmp15_; - gpointer _tmp16_; - KeyValueMap* _tmp17_; - KeyValueMap* _tmp18_; - KeyValueMap* _tmp19_; -#line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _object_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + GeeHashMap* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + gpointer _tmp12_; + KeyValueMap* _tmp13_; + KeyValueMap* _tmp14_; + KeyValueMap* _tmp15_; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_iterator_next (_tmp8_); + _tmp6_ = _object_it; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp6_)) { #line 282 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 32242 "Photo.c" +#line 32239 "Photo.c" } #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _object_it; + _tmp7_ = _object_it; #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 282 "/home/jens/Source/shotwell/src/Photo.vala" - object = (gchar*) _tmp11_; -#line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = clone; + object = (gchar*) _tmp8_; #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = object; + _tmp9_ = clone; #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = original; + _tmp10_ = object; #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = object; + _tmp11_ = object; #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_); + _tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (original, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_); #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = (KeyValueMap*) _tmp16_; + _tmp13_ = (KeyValueMap*) _tmp12_; #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = key_value_map_copy (_tmp17_); + _tmp14_ = key_value_map_copy (_tmp13_); #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_; + _tmp15_ = _tmp14_; #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp19_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_, _tmp15_); #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _key_value_map_unref0 (_tmp19_); + _key_value_map_unref0 (_tmp15_); #line 283 "/home/jens/Source/shotwell/src/Photo.vala" - _key_value_map_unref0 (_tmp17_); + _key_value_map_unref0 (_tmp13_); #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (object); -#line 32274 "Photo.c" +#line 32269 "Photo.c" } #line 282 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 32278 "Photo.c" +#line 32273 "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 32284 "Photo.c" +#line 32279 "Photo.c" } -static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (PhotoPhotoTransformationStateImpl* self) { - gboolean _tmp0_; +static void +photo_photo_transformation_state_impl_on_photo_baseline_replaced (PhotoPhotoTransformationStateImpl* self) +{ #line 288 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_PHOTO_TRANSFORMATION_STATE_IMPL (self)); #line 289 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_transformation_state_is_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState)); -#line 289 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp0_) { + if (!photo_transformation_state_is_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState))) { #line 290 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState), photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL], 0); -#line 32298 "Photo.c" +#line 32292 "Photo.c" } } -static void photo_photo_transformation_state_impl_class_init (PhotoPhotoTransformationStateImplClass * klass) { +static void +photo_photo_transformation_state_impl_class_init (PhotoPhotoTransformationStateImplClass * klass) +{ #line 237 "/home/jens/Source/shotwell/src/Photo.vala" photo_photo_transformation_state_impl_parent_class = g_type_class_peek_parent (klass); #line 237 "/home/jens/Source/shotwell/src/Photo.vala" 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 32310 "Photo.c" +#line 32306 "Photo.c" } -static void photo_photo_transformation_state_impl_instance_init (PhotoPhotoTransformationStateImpl * self) { +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 32317 "Photo.c" +#line 32315 "Photo.c" } -static void photo_photo_transformation_state_impl_finalize (GObject * obj) { +static void +photo_photo_transformation_state_impl_finalize (GObject * obj) +{ PhotoPhotoTransformationStateImpl * self; Photo* _tmp0_; guint _tmp1_; @@ -32348,7 +32348,9 @@ static void photo_photo_transformation_state_impl_finalize (GObject * obj) { } -static GType photo_photo_transformation_state_impl_get_type (void) { +static GType +photo_photo_transformation_state_impl_get_type (void) +{ static volatile gsize photo_photo_transformation_state_impl_type_id__volatile = 0; if (g_once_init_enter (&photo_photo_transformation_state_impl_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoPhotoTransformationStateImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_photo_transformation_state_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoPhotoTransformationStateImpl), 0, (GInstanceInitFunc) photo_photo_transformation_state_impl_instance_init, NULL }; @@ -32360,121 +32362,150 @@ static GType photo_photo_transformation_state_impl_get_type (void) { } -static PhotoBackingReaders* photo_backing_readers_construct (GType object_type) { +static PhotoBackingReaders* +photo_backing_readers_construct (GType object_type) +{ PhotoBackingReaders* self = NULL; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoBackingReaders*) g_type_create_instance (object_type); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32365 "Photo.c" +#line 32369 "Photo.c" } -static PhotoBackingReaders* photo_backing_readers_new (void) { +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 32372 "Photo.c" +#line 32378 "Photo.c" } -static void photo_value_backing_readers_init (GValue* value) { +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 32379 "Photo.c" +#line 32387 "Photo.c" } -static void photo_value_backing_readers_free_value (GValue* value) { +static void +photo_value_backing_readers_free_value (GValue* value) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" 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 32388 "Photo.c" +#line 32398 "Photo.c" } } -static void photo_value_backing_readers_copy_value (const GValue* src_value, GValue* dest_value) { +static void +photo_value_backing_readers_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" 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 32398 "Photo.c" +#line 32411 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32402 "Photo.c" +#line 32415 "Photo.c" } } -static gpointer photo_value_backing_readers_peek_pointer (const GValue* value) { +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 32410 "Photo.c" +#line 32425 "Photo.c" } -static gchar* photo_value_backing_readers_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 32417 "Photo.c" +#line 32437 "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 32424 "Photo.c" +#line 32444 "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 32428 "Photo.c" +#line 32448 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_backing_readers_ref (object); -#line 32432 "Photo.c" +#line 32452 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32436 "Photo.c" +#line 32456 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32440 "Photo.c" +#line 32460 "Photo.c" } -static gchar* photo_value_backing_readers_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_backing_readers_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoBackingReaders ** object_p; object_p = collect_values[0].v_pointer; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" 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 32451 "Photo.c" +#line 32476 "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 32457 "Photo.c" +#line 32482 "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 32461 "Photo.c" +#line 32486 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_backing_readers_ref (value->data[0].v_pointer); -#line 32465 "Photo.c" +#line 32490 "Photo.c" } #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32469 "Photo.c" +#line 32494 "Photo.c" } -static GParamSpec* photo_param_spec_backing_readers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +photo_param_spec_backing_readers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PhotoParamSpecBackingReaders* spec; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_BACKING_READERS), NULL); @@ -32484,20 +32515,25 @@ 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 32483 "Photo.c" +#line 32514 "Photo.c" } -static gpointer photo_value_get_backing_readers (const GValue* value) { +static gpointer +photo_value_get_backing_readers (const GValue* value) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" 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 32492 "Photo.c" +#line 32525 "Photo.c" } -static void photo_value_set_backing_readers (GValue* value, gpointer v_object) { +static void +photo_value_set_backing_readers (GValue* value, + gpointer v_object) +{ PhotoBackingReaders * old; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS)); @@ -32513,22 +32549,25 @@ 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 32512 "Photo.c" +#line 32548 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32516 "Photo.c" +#line 32552 "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 32522 "Photo.c" +#line 32558 "Photo.c" } } -static void photo_value_take_backing_readers (GValue* value, gpointer v_object) { +static void +photo_value_take_backing_readers (GValue* value, + gpointer v_object) +{ PhotoBackingReaders * old; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS)); @@ -32542,38 +32581,44 @@ 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 32541 "Photo.c" +#line 32580 "Photo.c" } else { #line 294 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32545 "Photo.c" +#line 32584 "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 32551 "Photo.c" +#line 32590 "Photo.c" } } -static void photo_backing_readers_class_init (PhotoBackingReadersClass * klass) { +static void +photo_backing_readers_class_init (PhotoBackingReadersClass * klass) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" 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 32561 "Photo.c" +#line 32602 "Photo.c" } -static void photo_backing_readers_instance_init (PhotoBackingReaders * self) { +static void +photo_backing_readers_instance_init (PhotoBackingReaders * self) +{ #line 294 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 32568 "Photo.c" +#line 32611 "Photo.c" } -static void photo_backing_readers_finalize (PhotoBackingReaders * obj) { +static void +photo_backing_readers_finalize (PhotoBackingReaders * obj) +{ PhotoBackingReaders * self; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_BACKING_READERS, PhotoBackingReaders); @@ -32585,11 +32630,13 @@ 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 32584 "Photo.c" +#line 32629 "Photo.c" } -static GType photo_backing_readers_get_type (void) { +static GType +photo_backing_readers_get_type (void) +{ static volatile gsize photo_backing_readers_type_id__volatile = 0; if (g_once_init_enter (&photo_backing_readers_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { photo_value_backing_readers_init, photo_value_backing_readers_free_value, photo_value_backing_readers_copy_value, photo_value_backing_readers_peek_pointer, "p", photo_value_backing_readers_collect_value, "p", photo_value_backing_readers_lcopy_value }; @@ -32603,18 +32650,22 @@ static GType photo_backing_readers_get_type (void) { } -static gpointer photo_backing_readers_ref (gpointer instance) { +static gpointer +photo_backing_readers_ref (gpointer instance) +{ PhotoBackingReaders * self; self = instance; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 294 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 32609 "Photo.c" +#line 32658 "Photo.c" } -static void photo_backing_readers_unref (gpointer instance) { +static void +photo_backing_readers_unref (gpointer instance) +{ PhotoBackingReaders * self; self = instance; #line 294 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32623,17 +32674,19 @@ 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 32622 "Photo.c" +#line 32673 "Photo.c" } } -static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Photo* photo, GdkPixbuf* pixbuf) { +static PhotoCachedPixbuf* +photo_cached_pixbuf_construct (GType object_type, + Photo* photo, + GdkPixbuf* pixbuf) +{ PhotoCachedPixbuf* self = NULL; Photo* _tmp0_; - Photo* _tmp1_; - GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp1_; #line 305 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); #line 305 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32641,132 +32694,156 @@ static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Phot #line 305 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoCachedPixbuf*) g_type_create_instance (object_type); #line 306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 306 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (photo); #line 306 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->photo); #line 306 "/home/jens/Source/shotwell/src/Photo.vala" - self->photo = _tmp1_; -#line 307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = pixbuf; + self->photo = _tmp0_; #line 307 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (pixbuf); #line 307 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->pixbuf); #line 307 "/home/jens/Source/shotwell/src/Photo.vala" - self->pixbuf = _tmp3_; + self->pixbuf = _tmp1_; #line 305 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32657 "Photo.c" +#line 32706 "Photo.c" } -static PhotoCachedPixbuf* photo_cached_pixbuf_new (Photo* photo, GdkPixbuf* pixbuf) { +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 32664 "Photo.c" +#line 32716 "Photo.c" } -static void photo_value_cached_pixbuf_init (GValue* value) { +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 32671 "Photo.c" +#line 32725 "Photo.c" } -static void photo_value_cached_pixbuf_free_value (GValue* value) { +static void +photo_value_cached_pixbuf_free_value (GValue* value) +{ #line 300 "/home/jens/Source/shotwell/src/Photo.vala" 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 32680 "Photo.c" +#line 32736 "Photo.c" } } -static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValue* dest_value) { +static void +photo_value_cached_pixbuf_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 300 "/home/jens/Source/shotwell/src/Photo.vala" 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 32690 "Photo.c" +#line 32749 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32694 "Photo.c" +#line 32753 "Photo.c" } } -static gpointer photo_value_cached_pixbuf_peek_pointer (const GValue* value) { +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 32702 "Photo.c" +#line 32763 "Photo.c" } -static gchar* photo_value_cached_pixbuf_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 32709 "Photo.c" +#line 32775 "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 32716 "Photo.c" +#line 32782 "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 32720 "Photo.c" +#line 32786 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_cached_pixbuf_ref (object); -#line 32724 "Photo.c" +#line 32790 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32728 "Photo.c" +#line 32794 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32732 "Photo.c" +#line 32798 "Photo.c" } -static gchar* photo_value_cached_pixbuf_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_cached_pixbuf_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoCachedPixbuf ** object_p; object_p = collect_values[0].v_pointer; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" 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 32743 "Photo.c" +#line 32814 "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 32749 "Photo.c" +#line 32820 "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 32753 "Photo.c" +#line 32824 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_cached_pixbuf_ref (value->data[0].v_pointer); -#line 32757 "Photo.c" +#line 32828 "Photo.c" } #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32761 "Photo.c" +#line 32832 "Photo.c" } -static GParamSpec* photo_param_spec_cached_pixbuf (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +photo_param_spec_cached_pixbuf (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PhotoParamSpecCachedPixbuf* spec; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_CACHED_PIXBUF), NULL); @@ -32776,20 +32853,25 @@ 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 32775 "Photo.c" +#line 32852 "Photo.c" } -static gpointer photo_value_get_cached_pixbuf (const GValue* value) { +static gpointer +photo_value_get_cached_pixbuf (const GValue* value) +{ #line 300 "/home/jens/Source/shotwell/src/Photo.vala" 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 32784 "Photo.c" +#line 32863 "Photo.c" } -static void photo_value_set_cached_pixbuf (GValue* value, gpointer v_object) { +static void +photo_value_set_cached_pixbuf (GValue* value, + gpointer v_object) +{ PhotoCachedPixbuf * old; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF)); @@ -32805,22 +32887,25 @@ 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 32804 "Photo.c" +#line 32886 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32808 "Photo.c" +#line 32890 "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 32814 "Photo.c" +#line 32896 "Photo.c" } } -static void photo_value_take_cached_pixbuf (GValue* value, gpointer v_object) { +static void +photo_value_take_cached_pixbuf (GValue* value, + gpointer v_object) +{ PhotoCachedPixbuf * old; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF)); @@ -32834,31 +32919,35 @@ 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 32833 "Photo.c" +#line 32918 "Photo.c" } else { #line 300 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32837 "Photo.c" +#line 32922 "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 32843 "Photo.c" +#line 32928 "Photo.c" } } -static void photo_cached_pixbuf_class_init (PhotoCachedPixbufClass * klass) { +static void +photo_cached_pixbuf_class_init (PhotoCachedPixbufClass * klass) +{ #line 300 "/home/jens/Source/shotwell/src/Photo.vala" 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 32853 "Photo.c" +#line 32940 "Photo.c" } -static void photo_cached_pixbuf_instance_init (PhotoCachedPixbuf * self) { +static void +photo_cached_pixbuf_instance_init (PhotoCachedPixbuf * self) +{ GTimer* _tmp0_; #line 303 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = g_timer_new (); @@ -32866,11 +32955,13 @@ 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 32865 "Photo.c" +#line 32954 "Photo.c" } -static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf * obj) { +static void +photo_cached_pixbuf_finalize (PhotoCachedPixbuf * obj) +{ PhotoCachedPixbuf * self; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_CACHED_PIXBUF, PhotoCachedPixbuf); @@ -32882,11 +32973,13 @@ 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 32881 "Photo.c" +#line 32972 "Photo.c" } -static GType photo_cached_pixbuf_get_type (void) { +static GType +photo_cached_pixbuf_get_type (void) +{ static volatile gsize photo_cached_pixbuf_type_id__volatile = 0; if (g_once_init_enter (&photo_cached_pixbuf_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { photo_value_cached_pixbuf_init, photo_value_cached_pixbuf_free_value, photo_value_cached_pixbuf_copy_value, photo_value_cached_pixbuf_peek_pointer, "p", photo_value_cached_pixbuf_collect_value, "p", photo_value_cached_pixbuf_lcopy_value }; @@ -32900,18 +32993,22 @@ static GType photo_cached_pixbuf_get_type (void) { } -static gpointer photo_cached_pixbuf_ref (gpointer instance) { +static gpointer +photo_cached_pixbuf_ref (gpointer instance) +{ PhotoCachedPixbuf * self; self = instance; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 300 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 32906 "Photo.c" +#line 33001 "Photo.c" } -static void photo_cached_pixbuf_unref (gpointer instance) { +static void +photo_cached_pixbuf_unref (gpointer instance) +{ PhotoCachedPixbuf * self; self = instance; #line 300 "/home/jens/Source/shotwell/src/Photo.vala" @@ -32920,119 +33017,146 @@ 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 32919 "Photo.c" +#line 33016 "Photo.c" } } -PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_type) { +PhotoReimportMasterState* +photo_reimport_master_state_construct (GType object_type) +{ PhotoReimportMasterState* self = NULL; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportMasterState*) g_type_create_instance (object_type); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 32930 "Photo.c" +#line 33029 "Photo.c" } -static void photo_value_reimport_master_state_init (GValue* value) { +static void +photo_value_reimport_master_state_init (GValue* value) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32937 "Photo.c" +#line 33038 "Photo.c" } -static void photo_value_reimport_master_state_free_value (GValue* value) { +static void +photo_value_reimport_master_state_free_value (GValue* value) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (value->data[0].v_pointer); -#line 32946 "Photo.c" +#line 33049 "Photo.c" } } -static void photo_value_reimport_master_state_copy_value (const GValue* src_value, GValue* dest_value) { +static void +photo_value_reimport_master_state_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_master_state_ref (src_value->data[0].v_pointer); -#line 32956 "Photo.c" +#line 33062 "Photo.c" } else { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 32960 "Photo.c" +#line 33066 "Photo.c" } } -static gpointer photo_value_reimport_master_state_peek_pointer (const GValue* value) { +static gpointer +photo_value_reimport_master_state_peek_pointer (const GValue* value) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 32968 "Photo.c" +#line 33076 "Photo.c" } -static gchar* photo_value_reimport_master_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_reimport_master_state_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 32975 "Photo.c" +#line 33088 "Photo.c" PhotoReimportMasterState * object; object = collect_values[0].v_pointer; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32982 "Photo.c" +#line 33095 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 32986 "Photo.c" +#line 33099 "Photo.c" } #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_master_state_ref (object); -#line 32990 "Photo.c" +#line 33103 "Photo.c" } else { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 32994 "Photo.c" +#line 33107 "Photo.c" } #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 32998 "Photo.c" +#line 33111 "Photo.c" } -static gchar* photo_value_reimport_master_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33009 "Photo.c" +#line 33127 "Photo.c" } #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33015 "Photo.c" +#line 33133 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33019 "Photo.c" +#line 33137 "Photo.c" } else { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_master_state_ref (value->data[0].v_pointer); -#line 33023 "Photo.c" +#line 33141 "Photo.c" } #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33027 "Photo.c" +#line 33145 "Photo.c" } -GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +photo_param_spec_reimport_master_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PhotoParamSpecReimportMasterState* spec; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL); @@ -33042,20 +33166,25 @@ GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33041 "Photo.c" +#line 33165 "Photo.c" } -gpointer photo_value_get_reimport_master_state (const GValue* value) { +gpointer +photo_value_get_reimport_master_state (const GValue* value) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33050 "Photo.c" +#line 33176 "Photo.c" } -void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) { +void +photo_value_set_reimport_master_state (GValue* value, + gpointer v_object) +{ PhotoReimportMasterState * old; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE)); @@ -33071,22 +33200,25 @@ void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_ref (value->data[0].v_pointer); -#line 33070 "Photo.c" +#line 33199 "Photo.c" } else { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33074 "Photo.c" +#line 33203 "Photo.c" } #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (old); -#line 33080 "Photo.c" +#line 33209 "Photo.c" } } -void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) { +void +photo_value_take_reimport_master_state (GValue* value, + gpointer v_object) +{ PhotoReimportMasterState * old; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE)); @@ -33100,48 +33232,56 @@ void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33099 "Photo.c" +#line 33231 "Photo.c" } else { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33103 "Photo.c" +#line 33235 "Photo.c" } #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_unref (old); -#line 33109 "Photo.c" +#line 33241 "Photo.c" } } -static void photo_reimport_master_state_class_init (PhotoReimportMasterStateClass * klass) { +static void +photo_reimport_master_state_class_init (PhotoReimportMasterStateClass * klass) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_parent_class = g_type_class_peek_parent (klass); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_finalize; -#line 33119 "Photo.c" +#line 33253 "Photo.c" } -static void photo_reimport_master_state_instance_init (PhotoReimportMasterState * self) { +static void +photo_reimport_master_state_instance_init (PhotoReimportMasterState * self) +{ #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33126 "Photo.c" +#line 33262 "Photo.c" } -static void photo_reimport_master_state_finalize (PhotoReimportMasterState * obj) { +static void +photo_reimport_master_state_finalize (PhotoReimportMasterState * obj) +{ PhotoReimportMasterState * self; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 33136 "Photo.c" +#line 33274 "Photo.c" } -GType photo_reimport_master_state_get_type (void) { +GType +photo_reimport_master_state_get_type (void) +{ static volatile gsize photo_reimport_master_state_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_master_state_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { photo_value_reimport_master_state_init, photo_value_reimport_master_state_free_value, photo_value_reimport_master_state_copy_value, photo_value_reimport_master_state_peek_pointer, "p", photo_value_reimport_master_state_collect_value, "p", photo_value_reimport_master_state_lcopy_value }; @@ -33155,18 +33295,22 @@ GType photo_reimport_master_state_get_type (void) { } -gpointer photo_reimport_master_state_ref (gpointer instance) { +gpointer +photo_reimport_master_state_ref (gpointer instance) +{ PhotoReimportMasterState * self; self = instance; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 33161 "Photo.c" +#line 33303 "Photo.c" } -void photo_reimport_master_state_unref (gpointer instance) { +void +photo_reimport_master_state_unref (gpointer instance) +{ PhotoReimportMasterState * self; self = instance; #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33175,42 +33319,47 @@ void photo_reimport_master_state_unref (gpointer instance) { PHOTO_REIMPORT_MASTER_STATE_GET_CLASS (self)->finalize (self); #line 1369 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 33174 "Photo.c" +#line 33318 "Photo.c" } } -static gchar** _vala_array_dup24 (gchar** self, int length) { +static gchar** +_vala_array_dup24 (gchar** self, + int length) +{ gchar** result; int i; #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" result = g_new0 (gchar*, length + 1); #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" for (i = 0; i < length; i++) { -#line 33186 "Photo.c" +#line 33333 "Photo.c" gchar* _tmp0_; #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = g_strdup (self[i]); #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" result[i] = _tmp0_; -#line 33192 "Photo.c" +#line 33339 "Photo.c" } #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 33196 "Photo.c" +#line 33343 "Photo.c" } -static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct (GType object_type, PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) { +static PhotoReimportMasterStateImpl* +photo_reimport_master_state_impl_construct (GType object_type, + PhotoRow* row, + PhotoMetadata* metadata, + gchar** alterations, + int alterations_length1) +{ PhotoReimportMasterStateImpl* self = NULL; PhotoRow* _tmp0_; - PhotoRow* _tmp1_; - PhotoMetadata* _tmp2_; - PhotoMetadata* _tmp3_; - gchar** _tmp4_; - gint _tmp4__length1; - gchar** _tmp5_; - gint _tmp5__length1; + PhotoMetadata* _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; #line 1378 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_ROW (row), NULL); #line 1378 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33218,60 +33367,61 @@ static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct #line 1378 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportMasterStateImpl*) photo_reimport_master_state_construct (object_type); #line 1379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = row; -#line 1379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _photo_row_ref0 (_tmp0_); + _tmp0_ = _photo_row_ref0 (row); #line 1379 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (self->row); #line 1379 "/home/jens/Source/shotwell/src/Photo.vala" - self->row = _tmp1_; -#line 1380 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; + self->row = _tmp0_; #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _media_metadata_ref0 (_tmp2_); + _tmp1_ = _media_metadata_ref0 (metadata); #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); #line 1380 "/home/jens/Source/shotwell/src/Photo.vala" - self->metadata = _tmp3_; -#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = alterations; -#line 1381 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4__length1 = alterations_length1; + self->metadata = _tmp1_; #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup24 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_); + _tmp2_ = (alterations != NULL) ? _vala_array_dup24 (alterations, alterations_length1) : ((gpointer) alterations); #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5__length1 = _tmp4__length1; + _tmp2__length1 = alterations_length1; #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL); #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" - self->alterations = _tmp5_; + self->alterations = _tmp2_; #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" - self->alterations_length1 = _tmp5__length1; + self->alterations_length1 = _tmp2__length1; #line 1381 "/home/jens/Source/shotwell/src/Photo.vala" self->_alterations_size_ = self->alterations_length1; #line 1378 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33250 "Photo.c" +#line 33391 "Photo.c" } -static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) { +static PhotoReimportMasterStateImpl* +photo_reimport_master_state_impl_new (PhotoRow* row, + PhotoMetadata* metadata, + gchar** alterations, + int alterations_length1) +{ #line 1378 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_master_state_impl_construct (PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, row, metadata, alterations, alterations_length1); -#line 33257 "Photo.c" +#line 33403 "Photo.c" } -static void photo_reimport_master_state_impl_class_init (PhotoReimportMasterStateImplClass * klass) { +static void +photo_reimport_master_state_impl_class_init (PhotoReimportMasterStateImplClass * klass) +{ #line 1372 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_master_state_impl_parent_class = g_type_class_peek_parent (klass); #line 1372 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_impl_finalize; -#line 33266 "Photo.c" +#line 33414 "Photo.c" } -static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterStateImpl * self) { +static void +photo_reimport_master_state_impl_instance_init (PhotoReimportMasterStateImpl * self) +{ PhotoRow* _tmp0_; #line 1373 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_row_new (); @@ -33279,11 +33429,13 @@ static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterS self->row = _tmp0_; #line 1376 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 33278 "Photo.c" +#line 33428 "Photo.c" } -static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj) { +static void +photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj) +{ PhotoReimportMasterStateImpl * self; #line 1372 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl); @@ -33295,11 +33447,13 @@ static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL); #line 1372 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_MASTER_STATE_CLASS (photo_reimport_master_state_impl_parent_class)->finalize (obj); -#line 33294 "Photo.c" +#line 33446 "Photo.c" } -static GType photo_reimport_master_state_impl_get_type (void) { +static GType +photo_reimport_master_state_impl_get_type (void) +{ static volatile gsize photo_reimport_master_state_impl_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_master_state_impl_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoReimportMasterStateImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_reimport_master_state_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoReimportMasterStateImpl), 0, (GInstanceInitFunc) photo_reimport_master_state_impl_instance_init, NULL }; @@ -33311,114 +33465,141 @@ static GType photo_reimport_master_state_impl_get_type (void) { } -PhotoReimportEditableState* photo_reimport_editable_state_construct (GType object_type) { +PhotoReimportEditableState* +photo_reimport_editable_state_construct (GType object_type) +{ PhotoReimportEditableState* self = NULL; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportEditableState*) g_type_create_instance (object_type); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33316 "Photo.c" +#line 33472 "Photo.c" } -static void photo_value_reimport_editable_state_init (GValue* value) { +static void +photo_value_reimport_editable_state_init (GValue* value) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33323 "Photo.c" +#line 33481 "Photo.c" } -static void photo_value_reimport_editable_state_free_value (GValue* value) { +static void +photo_value_reimport_editable_state_free_value (GValue* value) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (value->data[0].v_pointer); -#line 33332 "Photo.c" +#line 33492 "Photo.c" } } -static void photo_value_reimport_editable_state_copy_value (const GValue* src_value, GValue* dest_value) { +static void +photo_value_reimport_editable_state_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_editable_state_ref (src_value->data[0].v_pointer); -#line 33342 "Photo.c" +#line 33505 "Photo.c" } else { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 33346 "Photo.c" +#line 33509 "Photo.c" } } -static gpointer photo_value_reimport_editable_state_peek_pointer (const GValue* value) { +static gpointer +photo_value_reimport_editable_state_peek_pointer (const GValue* value) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33354 "Photo.c" +#line 33519 "Photo.c" } -static gchar* photo_value_reimport_editable_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_reimport_editable_state_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 33361 "Photo.c" +#line 33531 "Photo.c" PhotoReimportEditableState * object; object = collect_values[0].v_pointer; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33368 "Photo.c" +#line 33538 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33372 "Photo.c" +#line 33542 "Photo.c" } #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_editable_state_ref (object); -#line 33376 "Photo.c" +#line 33546 "Photo.c" } else { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33380 "Photo.c" +#line 33550 "Photo.c" } #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33384 "Photo.c" +#line 33554 "Photo.c" } -static gchar* photo_value_reimport_editable_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33395 "Photo.c" +#line 33570 "Photo.c" } #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33401 "Photo.c" +#line 33576 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33405 "Photo.c" +#line 33580 "Photo.c" } else { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_editable_state_ref (value->data[0].v_pointer); -#line 33409 "Photo.c" +#line 33584 "Photo.c" } #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33413 "Photo.c" +#line 33588 "Photo.c" } -GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +photo_param_spec_reimport_editable_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PhotoParamSpecReimportEditableState* spec; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL); @@ -33428,20 +33609,25 @@ GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const g G_PARAM_SPEC (spec)->value_type = object_type; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33427 "Photo.c" +#line 33608 "Photo.c" } -gpointer photo_value_get_reimport_editable_state (const GValue* value) { +gpointer +photo_value_get_reimport_editable_state (const GValue* value) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33436 "Photo.c" +#line 33619 "Photo.c" } -void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object) { +void +photo_value_set_reimport_editable_state (GValue* value, + gpointer v_object) +{ PhotoReimportEditableState * old; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE)); @@ -33457,22 +33643,25 @@ void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object) value->data[0].v_pointer = v_object; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_ref (value->data[0].v_pointer); -#line 33456 "Photo.c" +#line 33642 "Photo.c" } else { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33460 "Photo.c" +#line 33646 "Photo.c" } #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (old); -#line 33466 "Photo.c" +#line 33652 "Photo.c" } } -void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object) { +void +photo_value_take_reimport_editable_state (GValue* value, + gpointer v_object) +{ PhotoReimportEditableState * old; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE)); @@ -33486,48 +33675,56 @@ void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object) g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33485 "Photo.c" +#line 33674 "Photo.c" } else { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33489 "Photo.c" +#line 33678 "Photo.c" } #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_unref (old); -#line 33495 "Photo.c" +#line 33684 "Photo.c" } } -static void photo_reimport_editable_state_class_init (PhotoReimportEditableStateClass * klass) { +static void +photo_reimport_editable_state_class_init (PhotoReimportEditableStateClass * klass) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_parent_class = g_type_class_peek_parent (klass); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_finalize; -#line 33505 "Photo.c" +#line 33696 "Photo.c" } -static void photo_reimport_editable_state_instance_init (PhotoReimportEditableState * self) { +static void +photo_reimport_editable_state_instance_init (PhotoReimportEditableState * self) +{ #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33512 "Photo.c" +#line 33705 "Photo.c" } -static void photo_reimport_editable_state_finalize (PhotoReimportEditableState * obj) { +static void +photo_reimport_editable_state_finalize (PhotoReimportEditableState * obj) +{ PhotoReimportEditableState * self; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 33522 "Photo.c" +#line 33717 "Photo.c" } -GType photo_reimport_editable_state_get_type (void) { +GType +photo_reimport_editable_state_get_type (void) +{ static volatile gsize photo_reimport_editable_state_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_editable_state_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { photo_value_reimport_editable_state_init, photo_value_reimport_editable_state_free_value, photo_value_reimport_editable_state_copy_value, photo_value_reimport_editable_state_peek_pointer, "p", photo_value_reimport_editable_state_collect_value, "p", photo_value_reimport_editable_state_lcopy_value }; @@ -33541,18 +33738,22 @@ GType photo_reimport_editable_state_get_type (void) { } -gpointer photo_reimport_editable_state_ref (gpointer instance) { +gpointer +photo_reimport_editable_state_ref (gpointer instance) +{ PhotoReimportEditableState * self; self = instance; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 33547 "Photo.c" +#line 33746 "Photo.c" } -void photo_reimport_editable_state_unref (gpointer instance) { +void +photo_reimport_editable_state_unref (gpointer instance) +{ PhotoReimportEditableState * self; self = instance; #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33561,17 +33762,19 @@ void photo_reimport_editable_state_unref (gpointer instance) { PHOTO_REIMPORT_EDITABLE_STATE_GET_CLASS (self)->finalize (self); #line 1385 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 33560 "Photo.c" +#line 33761 "Photo.c" } } -static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_construct (GType object_type, BackingPhotoRow* backing_state, PhotoMetadata* metadata) { +static PhotoReimportEditableStateImpl* +photo_reimport_editable_state_impl_construct (GType object_type, + BackingPhotoRow* backing_state, + PhotoMetadata* metadata) +{ PhotoReimportEditableStateImpl* self = NULL; BackingPhotoRow* _tmp0_; - BackingPhotoRow* _tmp1_; - PhotoMetadata* _tmp2_; - PhotoMetadata* _tmp3_; + PhotoMetadata* _tmp1_; #line 1393 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing_state), NULL); #line 1393 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33579,44 +33782,47 @@ static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_constr #line 1393 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportEditableStateImpl*) photo_reimport_editable_state_construct (object_type); #line 1394 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = backing_state; -#line 1394 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _backing_photo_row_ref0 (_tmp0_); + _tmp0_ = _backing_photo_row_ref0 (backing_state); #line 1394 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing_state); #line 1394 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing_state = _tmp1_; -#line 1395 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; + self->backing_state = _tmp0_; #line 1395 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _media_metadata_ref0 (_tmp2_); + _tmp1_ = _media_metadata_ref0 (metadata); #line 1395 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); #line 1395 "/home/jens/Source/shotwell/src/Photo.vala" - self->metadata = _tmp3_; + self->metadata = _tmp1_; #line 1393 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33595 "Photo.c" +#line 33794 "Photo.c" } -static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata) { +static PhotoReimportEditableStateImpl* +photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, + PhotoMetadata* metadata) +{ #line 1393 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_editable_state_impl_construct (PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, backing_state, metadata); -#line 33602 "Photo.c" +#line 33804 "Photo.c" } -static void photo_reimport_editable_state_impl_class_init (PhotoReimportEditableStateImplClass * klass) { +static void +photo_reimport_editable_state_impl_class_init (PhotoReimportEditableStateImplClass * klass) +{ #line 1388 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_editable_state_impl_parent_class = g_type_class_peek_parent (klass); #line 1388 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_impl_finalize; -#line 33611 "Photo.c" +#line 33815 "Photo.c" } -static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEditableStateImpl * self) { +static void +photo_reimport_editable_state_impl_instance_init (PhotoReimportEditableStateImpl * self) +{ BackingPhotoRow* _tmp0_; #line 1389 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing_photo_row_new (); @@ -33624,11 +33830,13 @@ static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEdita self->backing_state = _tmp0_; #line 1391 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 33623 "Photo.c" +#line 33829 "Photo.c" } -static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState * obj) { +static void +photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState * obj) +{ PhotoReimportEditableStateImpl * self; #line 1388 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl); @@ -33638,11 +33846,13 @@ static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableSt _media_metadata_unref0 (self->metadata); #line 1388 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_EDITABLE_STATE_CLASS (photo_reimport_editable_state_impl_parent_class)->finalize (obj); -#line 33637 "Photo.c" +#line 33845 "Photo.c" } -static GType photo_reimport_editable_state_impl_get_type (void) { +static GType +photo_reimport_editable_state_impl_get_type (void) +{ static volatile gsize photo_reimport_editable_state_impl_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_editable_state_impl_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoReimportEditableStateImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_reimport_editable_state_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoReimportEditableStateImpl), 0, (GInstanceInitFunc) photo_reimport_editable_state_impl_instance_init, NULL }; @@ -33654,114 +33864,141 @@ static GType photo_reimport_editable_state_impl_get_type (void) { } -PhotoReimportRawDevelopmentState* photo_reimport_raw_development_state_construct (GType object_type) { +PhotoReimportRawDevelopmentState* +photo_reimport_raw_development_state_construct (GType object_type) +{ PhotoReimportRawDevelopmentState* self = NULL; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportRawDevelopmentState*) g_type_create_instance (object_type); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33659 "Photo.c" +#line 33871 "Photo.c" } -static void photo_value_reimport_raw_development_state_init (GValue* value) { +static void +photo_value_reimport_raw_development_state_init (GValue* value) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33666 "Photo.c" +#line 33880 "Photo.c" } -static void photo_value_reimport_raw_development_state_free_value (GValue* value) { +static void +photo_value_reimport_raw_development_state_free_value (GValue* value) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (value->data[0].v_pointer); -#line 33675 "Photo.c" +#line 33891 "Photo.c" } } -static void photo_value_reimport_raw_development_state_copy_value (const GValue* src_value, GValue* dest_value) { +static void +photo_value_reimport_raw_development_state_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_raw_development_state_ref (src_value->data[0].v_pointer); -#line 33685 "Photo.c" +#line 33904 "Photo.c" } else { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 33689 "Photo.c" +#line 33908 "Photo.c" } } -static gpointer photo_value_reimport_raw_development_state_peek_pointer (const GValue* value) { +static gpointer +photo_value_reimport_raw_development_state_peek_pointer (const GValue* value) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33697 "Photo.c" +#line 33918 "Photo.c" } -static gchar* photo_value_reimport_raw_development_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +photo_value_reimport_raw_development_state_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 33704 "Photo.c" +#line 33930 "Photo.c" PhotoReimportRawDevelopmentState * object; object = collect_values[0].v_pointer; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33711 "Photo.c" +#line 33937 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 33715 "Photo.c" +#line 33941 "Photo.c" } #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_raw_development_state_ref (object); -#line 33719 "Photo.c" +#line 33945 "Photo.c" } else { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33723 "Photo.c" +#line 33949 "Photo.c" } #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33727 "Photo.c" +#line 33953 "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) { +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 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 33738 "Photo.c" +#line 33969 "Photo.c" } #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 33744 "Photo.c" +#line 33975 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 33748 "Photo.c" +#line 33979 "Photo.c" } else { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_raw_development_state_ref (value->data[0].v_pointer); -#line 33752 "Photo.c" +#line 33983 "Photo.c" } #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 33756 "Photo.c" +#line 33987 "Photo.c" } -GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +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 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL); @@ -33771,20 +34008,25 @@ GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 33770 "Photo.c" +#line 34007 "Photo.c" } -gpointer photo_value_get_reimport_raw_development_state (const GValue* value) { +gpointer +photo_value_get_reimport_raw_development_state (const GValue* value) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 33779 "Photo.c" +#line 34018 "Photo.c" } -void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_object) { +void +photo_value_set_reimport_raw_development_state (GValue* value, + gpointer v_object) +{ PhotoReimportRawDevelopmentState * old; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE)); @@ -33800,22 +34042,25 @@ void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_o value->data[0].v_pointer = v_object; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_ref (value->data[0].v_pointer); -#line 33799 "Photo.c" +#line 34041 "Photo.c" } else { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33803 "Photo.c" +#line 34045 "Photo.c" } #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (old); -#line 33809 "Photo.c" +#line 34051 "Photo.c" } } -void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object) { +void +photo_value_take_reimport_raw_development_state (GValue* value, + gpointer v_object) +{ PhotoReimportRawDevelopmentState * old; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE)); @@ -33829,48 +34074,56 @@ void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 33828 "Photo.c" +#line 34073 "Photo.c" } else { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 33832 "Photo.c" +#line 34077 "Photo.c" } #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_unref (old); -#line 33838 "Photo.c" +#line 34083 "Photo.c" } } -static void photo_reimport_raw_development_state_class_init (PhotoReimportRawDevelopmentStateClass * klass) { +static void +photo_reimport_raw_development_state_class_init (PhotoReimportRawDevelopmentStateClass * klass) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_parent_class = g_type_class_peek_parent (klass); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_finalize; -#line 33848 "Photo.c" +#line 34095 "Photo.c" } -static void photo_reimport_raw_development_state_instance_init (PhotoReimportRawDevelopmentState * self) { +static void +photo_reimport_raw_development_state_instance_init (PhotoReimportRawDevelopmentState * self) +{ #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 33855 "Photo.c" +#line 34104 "Photo.c" } -static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState * obj) { +static void +photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState * obj) +{ PhotoReimportRawDevelopmentState * self; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_handlers_destroy (self); -#line 33865 "Photo.c" +#line 34116 "Photo.c" } -GType photo_reimport_raw_development_state_get_type (void) { +GType +photo_reimport_raw_development_state_get_type (void) +{ static volatile gsize photo_reimport_raw_development_state_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_raw_development_state_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { photo_value_reimport_raw_development_state_init, photo_value_reimport_raw_development_state_free_value, photo_value_reimport_raw_development_state_copy_value, photo_value_reimport_raw_development_state_peek_pointer, "p", photo_value_reimport_raw_development_state_collect_value, "p", photo_value_reimport_raw_development_state_lcopy_value }; @@ -33884,18 +34137,22 @@ GType photo_reimport_raw_development_state_get_type (void) { } -gpointer photo_reimport_raw_development_state_ref (gpointer instance) { +gpointer +photo_reimport_raw_development_state_ref (gpointer instance) +{ PhotoReimportRawDevelopmentState * self; self = instance; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 33890 "Photo.c" +#line 34145 "Photo.c" } -void photo_reimport_raw_development_state_unref (gpointer instance) { +void +photo_reimport_raw_development_state_unref (gpointer instance) +{ PhotoReimportRawDevelopmentState * self; self = instance; #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33904,34 +34161,40 @@ void photo_reimport_raw_development_state_unref (gpointer instance) { PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_GET_CLASS (self)->finalize (self); #line 1399 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 33903 "Photo.c" +#line 34160 "Photo.c" } } -static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_construct (GType object_type) { +static PhotoReimportRawDevelopmentStateImpl* +photo_reimport_raw_development_state_impl_construct (GType object_type) +{ PhotoReimportRawDevelopmentStateImpl* self = NULL; #line 1416 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportRawDevelopmentStateImpl*) photo_reimport_raw_development_state_construct (object_type); #line 1416 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 33914 "Photo.c" +#line 34173 "Photo.c" } -static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void) { +static PhotoReimportRawDevelopmentStateImpl* +photo_reimport_raw_development_state_impl_new (void) +{ #line 1416 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_raw_development_state_impl_construct (PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL); -#line 33921 "Photo.c" +#line 34182 "Photo.c" } -static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevelopmentStateImpl* self, BackingPhotoRow* backing, PhotoMetadata* metadata) { +static void +photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevelopmentStateImpl* self, + BackingPhotoRow* backing, + PhotoMetadata* metadata) +{ GeeCollection* _tmp0_; - BackingPhotoRow* _tmp1_; - PhotoMetadata* _tmp2_; - PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp3_; - PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp4_; + PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp1_; + PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp2_; #line 1419 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self)); #line 1419 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33941,22 +34204,20 @@ static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevel #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->list; #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = backing; -#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; -#line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_reimport_raw_development_state_impl_dev_to_reimport_new (_tmp1_, _tmp2_); + _tmp1_ = photo_reimport_raw_development_state_impl_dev_to_reimport_new (backing, metadata); #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - gee_collection_add (_tmp0_, _tmp4_); + gee_collection_add (_tmp0_, _tmp2_); #line 1420 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (_tmp4_); -#line 33951 "Photo.c" + _photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (_tmp2_); +#line 34210 "Photo.c" } -static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRawDevelopmentStateImpl* self) { +static gint +photo_reimport_raw_development_state_impl_get_size (PhotoReimportRawDevelopmentStateImpl* self) +{ gint result = 0; GeeCollection* _tmp0_; gint _tmp1_; @@ -33973,16 +34234,18 @@ static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRaw result = _tmp2_; #line 1424 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 33972 "Photo.c" +#line 34233 "Photo.c" } -static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_construct (GType object_type, BackingPhotoRow* backing, PhotoMetadata* metadata) { +static PhotoReimportRawDevelopmentStateImplDevToReimport* +photo_reimport_raw_development_state_impl_dev_to_reimport_construct (GType object_type, + BackingPhotoRow* backing, + PhotoMetadata* metadata) +{ PhotoReimportRawDevelopmentStateImplDevToReimport* self = NULL; BackingPhotoRow* _tmp0_; - BackingPhotoRow* _tmp1_; - PhotoMetadata* _tmp2_; - PhotoMetadata* _tmp3_; + PhotoMetadata* _tmp1_; #line 1407 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing), NULL); #line 1407 "/home/jens/Source/shotwell/src/Photo.vala" @@ -33990,132 +34253,156 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev #line 1407 "/home/jens/Source/shotwell/src/Photo.vala" self = (PhotoReimportRawDevelopmentStateImplDevToReimport*) g_type_create_instance (object_type); #line 1408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = backing; -#line 1408 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _backing_photo_row_ref0 (_tmp0_); + _tmp0_ = _backing_photo_row_ref0 (backing); #line 1408 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (self->backing); #line 1408 "/home/jens/Source/shotwell/src/Photo.vala" - self->backing = _tmp1_; -#line 1409 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; + self->backing = _tmp0_; #line 1409 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _media_metadata_ref0 (_tmp2_); + _tmp1_ = _media_metadata_ref0 (metadata); #line 1409 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); #line 1409 "/home/jens/Source/shotwell/src/Photo.vala" - self->metadata = _tmp3_; + self->metadata = _tmp1_; #line 1407 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 34006 "Photo.c" +#line 34265 "Photo.c" } -static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, PhotoMetadata* metadata) { +static PhotoReimportRawDevelopmentStateImplDevToReimport* +photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, + PhotoMetadata* metadata) +{ #line 1407 "/home/jens/Source/shotwell/src/Photo.vala" return photo_reimport_raw_development_state_impl_dev_to_reimport_construct (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, backing, metadata); -#line 34013 "Photo.c" +#line 34275 "Photo.c" } -static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_init (GValue* value) { +static void +photo_reimport_raw_development_state_impl_value_dev_to_reimport_init (GValue* value) +{ #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 34020 "Photo.c" +#line 34284 "Photo.c" } -static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_free_value (GValue* value) { +static void +photo_reimport_raw_development_state_impl_value_dev_to_reimport_free_value (GValue* value) +{ #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (value->data[0].v_pointer) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (value->data[0].v_pointer); -#line 34029 "Photo.c" +#line 34295 "Photo.c" } } -static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy_value (const GValue* src_value, GValue* dest_value) { +static void +photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (src_value->data[0].v_pointer) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (src_value->data[0].v_pointer); -#line 34039 "Photo.c" +#line 34308 "Photo.c" } else { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" dest_value->data[0].v_pointer = NULL; -#line 34043 "Photo.c" +#line 34312 "Photo.c" } } -static gpointer photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer (const GValue* value) { +static gpointer +photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer (const GValue* value) +{ #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 34051 "Photo.c" +#line 34322 "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) { +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 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (collect_values[0].v_pointer) { -#line 34058 "Photo.c" +#line 34334 "Photo.c" PhotoReimportRawDevelopmentStateImplDevToReimport * object; object = collect_values[0].v_pointer; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (object->parent_instance.g_class == NULL) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 34065 "Photo.c" +#line 34341 "Photo.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 34069 "Photo.c" +#line 34345 "Photo.c" } #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (object); -#line 34073 "Photo.c" +#line 34349 "Photo.c" } else { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 34077 "Photo.c" +#line 34353 "Photo.c" } #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 34081 "Photo.c" +#line 34357 "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) { +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 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (!object_p) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 34092 "Photo.c" +#line 34373 "Photo.c" } #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (!value->data[0].v_pointer) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = NULL; -#line 34098 "Photo.c" +#line 34379 "Photo.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = value->data[0].v_pointer; -#line 34102 "Photo.c" +#line 34383 "Photo.c" } else { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" *object_p = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer); -#line 34106 "Photo.c" +#line 34387 "Photo.c" } #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 34110 "Photo.c" +#line 34391 "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) { +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 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (g_type_is_a (object_type, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL); @@ -34125,20 +34412,25 @@ static GParamSpec* photo_reimport_raw_development_state_impl_param_spec_dev_to_r G_PARAM_SPEC (spec)->value_type = object_type; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return G_PARAM_SPEC (spec); -#line 34124 "Photo.c" +#line 34411 "Photo.c" } -static gpointer photo_reimport_raw_development_state_impl_value_get_dev_to_reimport (const GValue* value) { +static gpointer +photo_reimport_raw_development_state_impl_value_get_dev_to_reimport (const GValue* value) +{ #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL); #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return value->data[0].v_pointer; -#line 34133 "Photo.c" +#line 34422 "Photo.c" } -static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, gpointer v_object) { +static void +photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, + gpointer v_object) +{ PhotoReimportRawDevelopmentStateImplDevToReimport * old; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT)); @@ -34154,22 +34446,25 @@ static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport value->data[0].v_pointer = v_object; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer); -#line 34153 "Photo.c" +#line 34445 "Photo.c" } else { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 34157 "Photo.c" +#line 34449 "Photo.c" } #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old); -#line 34163 "Photo.c" +#line 34455 "Photo.c" } } -static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, gpointer v_object) { +static void +photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, + gpointer v_object) +{ PhotoReimportRawDevelopmentStateImplDevToReimport * old; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT)); @@ -34183,31 +34478,35 @@ static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = v_object; -#line 34182 "Photo.c" +#line 34477 "Photo.c" } else { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" value->data[0].v_pointer = NULL; -#line 34186 "Photo.c" +#line 34481 "Photo.c" } #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" if (old) { #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old); -#line 34192 "Photo.c" +#line 34487 "Photo.c" } } -static void photo_reimport_raw_development_state_impl_dev_to_reimport_class_init (PhotoReimportRawDevelopmentStateImplDevToReimportClass * klass) { +static void +photo_reimport_raw_development_state_impl_dev_to_reimport_class_init (PhotoReimportRawDevelopmentStateImplDevToReimportClass * klass) +{ #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_dev_to_reimport_parent_class = g_type_class_peek_parent (klass); #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateImplDevToReimportClass *) klass)->finalize = photo_reimport_raw_development_state_impl_dev_to_reimport_finalize; -#line 34202 "Photo.c" +#line 34499 "Photo.c" } -static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_init (PhotoReimportRawDevelopmentStateImplDevToReimport * self) { +static void +photo_reimport_raw_development_state_impl_dev_to_reimport_instance_init (PhotoReimportRawDevelopmentStateImplDevToReimport * self) +{ BackingPhotoRow* _tmp0_; #line 1404 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = backing_photo_row_new (); @@ -34215,11 +34514,13 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_i self->backing = _tmp0_; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" self->ref_count = 1; -#line 34214 "Photo.c" +#line 34513 "Photo.c" } -static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport * obj) { +static void +photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport * obj) +{ PhotoReimportRawDevelopmentStateImplDevToReimport * self; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, PhotoReimportRawDevelopmentStateImplDevToReimport); @@ -34229,11 +34530,13 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize ( _backing_photo_row_unref0 (self->backing); #line 1405 "/home/jens/Source/shotwell/src/Photo.vala" _media_metadata_unref0 (self->metadata); -#line 34228 "Photo.c" +#line 34529 "Photo.c" } -GType photo_reimport_raw_development_state_impl_dev_to_reimport_get_type (void) { +GType +photo_reimport_raw_development_state_impl_dev_to_reimport_get_type (void) +{ static volatile gsize photo_reimport_raw_development_state_impl_dev_to_reimport_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_raw_development_state_impl_dev_to_reimport_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { photo_reimport_raw_development_state_impl_value_dev_to_reimport_init, photo_reimport_raw_development_state_impl_value_dev_to_reimport_free_value, photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy_value, photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer, "p", photo_reimport_raw_development_state_impl_value_dev_to_reimport_collect_value, "p", photo_reimport_raw_development_state_impl_value_dev_to_reimport_lcopy_value }; @@ -34247,18 +34550,22 @@ 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) { +static gpointer +photo_reimport_raw_development_state_impl_dev_to_reimport_ref (gpointer instance) +{ PhotoReimportRawDevelopmentStateImplDevToReimport * self; self = instance; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_atomic_int_inc (&self->ref_count); #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" return instance; -#line 34253 "Photo.c" +#line 34558 "Photo.c" } -static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpointer instance) { +static void +photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpointer instance) +{ PhotoReimportRawDevelopmentStateImplDevToReimport * self; self = instance; #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" @@ -34267,21 +34574,25 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpo PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_GET_CLASS (self)->finalize (self); #line 1403 "/home/jens/Source/shotwell/src/Photo.vala" g_type_free_instance ((GTypeInstance *) self); -#line 34266 "Photo.c" +#line 34573 "Photo.c" } } -static void photo_reimport_raw_development_state_impl_class_init (PhotoReimportRawDevelopmentStateImplClass * klass) { +static void +photo_reimport_raw_development_state_impl_class_init (PhotoReimportRawDevelopmentStateImplClass * klass) +{ #line 1402 "/home/jens/Source/shotwell/src/Photo.vala" photo_reimport_raw_development_state_impl_parent_class = g_type_class_peek_parent (klass); #line 1402 "/home/jens/Source/shotwell/src/Photo.vala" ((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_impl_finalize; -#line 34276 "Photo.c" +#line 34585 "Photo.c" } -static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimportRawDevelopmentStateImpl * self) { +static void +photo_reimport_raw_development_state_impl_instance_init (PhotoReimportRawDevelopmentStateImpl * self) +{ GeeArrayList* _tmp0_; #line 1413 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = gee_array_list_new (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, (GBoxedCopyFunc) photo_reimport_raw_development_state_impl_dev_to_reimport_ref, (GDestroyNotify) photo_reimport_raw_development_state_impl_dev_to_reimport_unref, NULL, NULL, NULL); @@ -34289,11 +34600,13 @@ static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimpo self->list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 1414 "/home/jens/Source/shotwell/src/Photo.vala" self->metadata_only = FALSE; -#line 34288 "Photo.c" +#line 34599 "Photo.c" } -static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState * obj) { +static void +photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState * obj) +{ PhotoReimportRawDevelopmentStateImpl * self; #line 1402 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl); @@ -34301,11 +34614,13 @@ static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRaw _g_object_unref0 (self->list); #line 1402 "/home/jens/Source/shotwell/src/Photo.vala" PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_CLASS (photo_reimport_raw_development_state_impl_parent_class)->finalize (obj); -#line 34300 "Photo.c" +#line 34613 "Photo.c" } -static GType photo_reimport_raw_development_state_impl_get_type (void) { +static GType +photo_reimport_raw_development_state_impl_get_type (void) +{ static volatile gsize photo_reimport_raw_development_state_impl_type_id__volatile = 0; if (g_once_init_enter (&photo_reimport_raw_development_state_impl_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoReimportRawDevelopmentStateImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_reimport_raw_development_state_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoReimportRawDevelopmentStateImpl), 0, (GInstanceInitFunc) photo_reimport_raw_development_state_impl_instance_init, NULL }; @@ -34317,7 +34632,9 @@ static GType photo_reimport_raw_development_state_impl_get_type (void) { } -static void photo_class_init (PhotoClass * klass) { +static void +photo_class_init (PhotoClass * klass) +{ #line 161 "/home/jens/Source/shotwell/src/Photo.vala" photo_parent_class = g_type_class_peek_parent (klass); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" @@ -34444,22 +34761,26 @@ static void photo_class_init (PhotoClass * klass) { photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL] = g_signal_new ("source-reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA); #line 326 "/home/jens/Source/shotwell/src/Photo.vala" g_rec_mutex_init (&__lock_photo_source_pixbuf_cache); -#line 34443 "Photo.c" +#line 34760 "Photo.c" } -static void photo_dateable_interface_init (DateableIface * iface) { +static void +photo_dateable_interface_init (DateableIface * iface) +{ #line 161 "/home/jens/Source/shotwell/src/Photo.vala" photo_dateable_parent_iface = g_type_interface_peek_parent (iface); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" 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 34454 "Photo.c" +#line 34773 "Photo.c" } -static void photo_instance_init (Photo * self) { +static void +photo_instance_init (Photo * self) +{ BackingPhotoRow* _tmp0_; PhotoBackingReaders* _tmp1_; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" @@ -34498,11 +34819,13 @@ 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 34497 "Photo.c" +#line 34818 "Photo.c" } -static void photo_finalize (GObject * obj) { +static void +photo_finalize (GObject * obj) +{ Photo * self; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO, Photo); @@ -34538,11 +34861,13 @@ 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 34537 "Photo.c" +#line 34860 "Photo.c" } -GType photo_get_type (void) { +GType +photo_get_type (void) +{ static volatile gsize photo_type_id__volatile = 0; if (g_once_init_enter (&photo_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Photo), 0, (GInstanceInitFunc) photo_instance_init, NULL }; @@ -34556,39 +34881,51 @@ GType photo_get_type (void) { } -static void _vala_photo_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_photo_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ Photo * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" switch (property_id) { -#line 34560 "Photo.c" +#line 34890 "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 34566 "Photo.c" +#line 34896 "Photo.c" } } -static void _vala_photo_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_photo_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ Photo * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" switch (property_id) { -#line 34576 "Photo.c" +#line 34911 "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 34582 "Photo.c" +#line 34917 "Photo.c" } } -GType library_photo_source_collection_state_get_type (void) { +GType +library_photo_source_collection_state_get_type (void) +{ static volatile gsize library_photo_source_collection_state_type_id__volatile = 0; if (g_once_init_enter (&library_photo_source_collection_state_type_id__volatile)) { static const GEnumValue values[] = {{LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN, "LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN", "unknown"}, {LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE, "LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE", "online"}, {LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE, "LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE", "offline"}, {LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH, "LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH", "trash"}, {LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE, "LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE", "editable"}, {LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER, "LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER", "developer"}, {0, NULL, NULL}}; @@ -34600,34 +34937,47 @@ GType library_photo_source_collection_state_get_type (void) { } -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_file_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = file_hash ((GFile*) v); #line 4483 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34604 "Photo.c" +#line 34944 "Photo.c" } -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = file_equal ((GFile*) a, (GFile*) b); #line 4483 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34613 "Photo.c" +#line 34957 "Photo.c" } -static gint _int64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_int64_compare_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = int64_compare ((gint64*) a, (gint64*) b); #line 4487 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34622 "Photo.c" +#line 34970 "Photo.c" } -static gint64* _int64_dup (gint64* self) { +static gint64* +_int64_dup (gint64* self) +{ gint64* dup; #line 4487 "/home/jens/Source/shotwell/src/Photo.vala" dup = g_new0 (gint64, 1); @@ -34635,43 +34985,62 @@ static gint64* _int64_dup (gint64* self) { memcpy (dup, self, sizeof (gint64)); #line 4487 "/home/jens/Source/shotwell/src/Photo.vala" return dup; -#line 34634 "Photo.c" +#line 34984 "Photo.c" } -static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_int64_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = int64_equal ((gint64*) a, (gint64*) b); #line 4489 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34643 "Photo.c" +#line 34997 "Photo.c" } -static gint64 _photo_get_photo_key_get_source_database_key (DataSource* source, gpointer self) { +static gint64 +_photo_get_photo_key_get_source_database_key (DataSource* source, + gpointer self) +{ gint64 result; result = photo_get_photo_key (source); #line 4509 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34652 "Photo.c" +#line 35009 "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) { +static void +_library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self) +{ #line 4511 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_trashcan_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed); -#line 34659 "Photo.c" +#line 35021 "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) { +static void +_library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, + GeeCollection* added, + GeeCollection* removed, + gpointer self) +{ #line 4512 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_offline_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed); -#line 34666 "Photo.c" +#line 35033 "Photo.c" } -LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType object_type) { +LibraryPhotoSourceCollection* +library_photo_source_collection_construct (GType object_type) +{ LibraryPhotoSourceCollection* self = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; @@ -34697,27 +35066,35 @@ LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType o _source_holding_tank_unref0 (_tmp3_); #line 4508 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 34696 "Photo.c" +#line 35065 "Photo.c" } -LibraryPhotoSourceCollection* library_photo_source_collection_new (void) { +LibraryPhotoSourceCollection* +library_photo_source_collection_new (void) +{ #line 4508 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_source_collection_construct (TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION); -#line 34703 "Photo.c" +#line 35074 "Photo.c" } -static gboolean _library_photo_source_collection_check_if_trashed_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) { +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 4516 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34712 "Photo.c" +#line 35087 "Photo.c" } -static MediaSourceHoldingTank* library_photo_source_collection_real_create_trashcan (MediaSourceCollection* base) { +static MediaSourceHoldingTank* +library_photo_source_collection_real_create_trashcan (MediaSourceCollection* base) +{ LibraryPhotoSourceCollection * self; MediaSourceHoldingTank* result = NULL; LibraryPhotoSourceHoldingTank* _tmp0_; @@ -34729,20 +35106,26 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_trash result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); #line 4516 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34728 "Photo.c" +#line 35105 "Photo.c" } -static gboolean _library_photo_source_collection_check_if_offline_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) { +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 4520 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34737 "Photo.c" +#line 35118 "Photo.c" } -static MediaSourceHoldingTank* library_photo_source_collection_real_create_offline_bin (MediaSourceCollection* base) { +static MediaSourceHoldingTank* +library_photo_source_collection_real_create_offline_bin (MediaSourceCollection* base) +{ LibraryPhotoSourceCollection * self; MediaSourceHoldingTank* result = NULL; LibraryPhotoSourceHoldingTank* _tmp0_; @@ -34754,16 +35137,18 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_offli result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); #line 4520 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34753 "Photo.c" +#line 35136 "Photo.c" } -static MediaMonitor* library_photo_source_collection_real_create_media_monitor (MediaSourceCollection* base, Workers* workers, GCancellable* cancellable) { +static MediaMonitor* +library_photo_source_collection_real_create_media_monitor (MediaSourceCollection* base, + Workers* workers, + GCancellable* cancellable) +{ LibraryPhotoSourceCollection * self; MediaMonitor* result = NULL; - Workers* _tmp0_; - GCancellable* _tmp1_; - PhotoMonitor* _tmp2_; + PhotoMonitor* _tmp0_; #line 4523 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4523 "/home/jens/Source/shotwell/src/Photo.vala" @@ -34771,38 +35156,36 @@ static MediaMonitor* library_photo_source_collection_real_create_media_monitor ( #line 4523 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); #line 4524 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = workers; -#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = cancellable; + _tmp0_ = photo_monitor_new (workers, cancellable); #line 4524 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo_monitor_new (_tmp0_, _tmp1_); -#line 4524 "/home/jens/Source/shotwell/src/Photo.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_MONITOR, MediaMonitor); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_MONITOR, MediaMonitor); #line 4524 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34779 "Photo.c" +#line 35160 "Photo.c" } -static gboolean library_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) { +static gboolean +library_photo_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source) +{ LibraryPhotoSourceCollection * self; gboolean result = FALSE; - DataSource* _tmp0_; #line 4527 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4527 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 4528 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = source; -#line 4528 "/home/jens/Source/shotwell/src/Photo.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO); + result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_LIBRARY_PHOTO); #line 4528 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34797 "Photo.c" +#line 35178 "Photo.c" } -static gchar* library_photo_source_collection_real_get_typename (MediaSourceCollection* base) { +static gchar* +library_photo_source_collection_real_get_typename (MediaSourceCollection* base) +{ LibraryPhotoSourceCollection * self; gchar* result = NULL; gchar* _tmp0_; @@ -34814,51 +35197,56 @@ static gchar* library_photo_source_collection_real_get_typename (MediaSourceColl result = _tmp0_; #line 4532 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34813 "Photo.c" +#line 35196 "Photo.c" } -static gboolean library_photo_source_collection_real_is_file_recognized (MediaSourceCollection* base, GFile* file) { +static gboolean +library_photo_source_collection_real_is_file_recognized (MediaSourceCollection* base, + GFile* file) +{ LibraryPhotoSourceCollection * self; gboolean result = FALSE; - GFile* _tmp0_; - gboolean _tmp1_; #line 4535 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4535 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 4536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_file_format_is_file_supported (_tmp0_); -#line 4536 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp1_; + result = photo_file_format_is_file_supported (file); #line 4536 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 34834 "Photo.c" +#line 35214 "Photo.c" } -static void _library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) { +static void +_library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, + GFile* old_file, + GFile* new_file, + gpointer self) +{ #line 4548 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_editable_replaced ((LibraryPhotoSourceCollection*) self, _sender, old_file, new_file); -#line 34841 "Photo.c" +#line 35226 "Photo.c" } -static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) { +static void +_library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, + gpointer self) +{ #line 4554 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_on_raw_development_modified ((LibraryPhotoSourceCollection*) self, _sender); -#line 34848 "Photo.c" +#line 35236 "Photo.c" } -static void library_photo_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed) { +static void +library_photo_source_collection_real_notify_contents_altered (DataCollection* base, + GeeIterable* added, + GeeIterable* removed) +{ LibraryPhotoSourceCollection * self; - GeeIterable* _tmp0_; - GeeIterable* _tmp75_; - GeeIterable* _tmp153_; - GeeIterable* _tmp154_; #line 4539 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4539 "/home/jens/Source/shotwell/src/Photo.vala" @@ -34866,370 +35254,356 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo #line 4539 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 4541 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = added; -#line 4541 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != NULL) { -#line 34868 "Photo.c" + if (added != NULL) { +#line 35254 "Photo.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; -#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = added; + GeeIterator* _tmp0_; #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); + _tmp0_ = gee_iterable_iterator (added); #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _object_it = _tmp2_; + _object_it = _tmp0_; #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 34881 "Photo.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 35264 "Photo.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; LibraryPhoto* photo = NULL; - DataObject* _tmp7_; - LibraryPhoto* _tmp8_; + DataObject* _tmp4_; + LibraryPhoto* _tmp5_; GFile* editable = NULL; - LibraryPhoto* _tmp9_; - GFile* _tmp10_; - GFile* _tmp11_; - LibraryPhoto* _tmp15_; + LibraryPhoto* _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; + LibraryPhoto* _tmp12_; GeeCollection* raw_list = NULL; - LibraryPhoto* _tmp16_; - GeeCollection* _tmp17_; - GeeCollection* _tmp18_; - LibraryPhoto* _tmp28_; + LibraryPhoto* _tmp13_; + GeeCollection* _tmp14_; + GeeCollection* _tmp15_; + LibraryPhoto* _tmp24_; gint64 master_filesize = 0LL; - LibraryPhoto* _tmp29_; - BackingPhotoRow* _tmp30_; - BackingPhotoRow* _tmp31_; - gint64 _tmp32_; - gint64 _tmp33_; - gint64 _tmp34_ = 0LL; - LibraryPhoto* _tmp35_; - BackingPhotoRow* _tmp36_; - BackingPhotoRow* _tmp37_; - gboolean _tmp38_; + LibraryPhoto* _tmp25_; + BackingPhotoRow* _tmp26_; + BackingPhotoRow* _tmp27_; + gint64 _tmp28_; + gint64 _tmp29_; + gint64 _tmp30_ = 0LL; + LibraryPhoto* _tmp31_; + BackingPhotoRow* _tmp32_; + BackingPhotoRow* _tmp33_; + gboolean _tmp34_; gint64 editable_filesize = 0LL; - GeeMultiMap* _tmp43_; + GeeMultiMap* _tmp39_; + gint64 _tmp40_; + LibraryPhoto* _tmp41_; + GeeHashMap* _tmp42_; + LibraryPhoto* _tmp43_; gint64 _tmp44_; - LibraryPhoto* _tmp45_; - GeeHashMap* _tmp46_; - LibraryPhoto* _tmp47_; - gint64 _tmp48_; - gint64 _tmp49_; + gint64 _tmp45_; GeeCollection* raw_rows = NULL; - LibraryPhoto* _tmp56_; - GeeCollection* _tmp57_; - GeeCollection* _tmp58_; -#line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _object_it; + LibraryPhoto* _tmp52_; + GeeCollection* _tmp53_; + GeeCollection* _tmp54_; #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp1_ = _object_it; #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 34931 "Photo.c" +#line 35311 "Photo.c" } #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _object_it; + _tmp2_ = _object_it; #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp3_; #line 4543 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = object; + _tmp4_ = object; #line 4543 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 4543 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp8_; + photo = _tmp5_; #line 4545 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo; + _tmp6_ = photo; #line 4545 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo)); + _tmp7_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); #line 4545 "/home/jens/Source/shotwell/src/Photo.vala" - editable = _tmp10_; + editable = _tmp7_; #line 4546 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = editable; + _tmp8_ = editable; #line 4546 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_ != NULL) { -#line 34955 "Photo.c" - GeeHashMap* _tmp12_; - GFile* _tmp13_; - LibraryPhoto* _tmp14_; + if (_tmp8_ != NULL) { +#line 35335 "Photo.c" + GeeHashMap* _tmp9_; + GFile* _tmp10_; + LibraryPhoto* _tmp11_; #line 4547 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = self->priv->by_editable_file; + _tmp9_ = self->priv->by_editable_file; #line 4547 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = editable; + _tmp10_ = editable; #line 4547 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo; + _tmp11_ = photo; #line 4547 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp14_); -#line 34967 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_, _tmp11_); +#line 35347 "Photo.c" } #line 4548 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo; + _tmp12_ = photo; #line 4548 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self); #line 4550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo; + _tmp13_ = photo; #line 4550 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo)); + _tmp14_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo)); #line 4550 "/home/jens/Source/shotwell/src/Photo.vala" - raw_list = _tmp17_; + raw_list = _tmp14_; #line 4551 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = raw_list; + _tmp15_ = raw_list; #line 4551 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp18_ != NULL) { -#line 34983 "Photo.c" + if (_tmp15_ != NULL) { +#line 35363 "Photo.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp19_; - GeeIterator* _tmp20_; + GeeCollection* _tmp16_; + GeeIterator* _tmp17_; #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = raw_list; + _tmp16_ = raw_list; #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp20_; + _f_it = _tmp17_; #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 34996 "Photo.c" - GeeIterator* _tmp21_; - gboolean _tmp22_; +#line 35376 "Photo.c" + GeeIterator* _tmp18_; GFile* f = NULL; - GeeIterator* _tmp23_; - gpointer _tmp24_; - GeeHashMap* _tmp25_; - GFile* _tmp26_; - LibraryPhoto* _tmp27_; -#line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _f_it; + GeeIterator* _tmp19_; + gpointer _tmp20_; + GeeHashMap* _tmp21_; + GFile* _tmp22_; + LibraryPhoto* _tmp23_; #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = gee_iterator_next (_tmp21_); + _tmp18_ = _f_it; #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp22_) { + if (!gee_iterator_next (_tmp18_)) { #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35013 "Photo.c" +#line 35390 "Photo.c" } #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = _f_it; + _tmp19_ = _f_it; #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = gee_iterator_get (_tmp23_); + _tmp20_ = gee_iterator_get (_tmp19_); #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp24_; + f = (GFile*) _tmp20_; #line 4553 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = self->priv->by_raw_development_file; + _tmp21_ = self->priv->by_raw_development_file; #line 4553 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = f; + _tmp22_ = f; #line 4553 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = photo; + _tmp23_ = photo; #line 4553 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, _tmp27_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, _tmp23_); #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 35031 "Photo.c" +#line 35408 "Photo.c" } #line 4552 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 35035 "Photo.c" +#line 35412 "Photo.c" } } #line 4554 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = photo; + _tmp24_ = photo; #line 4554 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self); #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = photo; + _tmp25_ = photo; #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_PHOTO, Photo)); + _tmp26_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo)); #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp30_; + _tmp27_ = _tmp26_; #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _tmp31_->filesize; + _tmp28_ = _tmp27_->filesize; #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tmp32_; + _tmp29_ = _tmp28_; #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp31_); + _backing_photo_row_unref0 (_tmp27_); #line 4556 "/home/jens/Source/shotwell/src/Photo.vala" - master_filesize = _tmp33_; + master_filesize = _tmp29_; #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo; + _tmp31_ = photo; #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo)); + _tmp32_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO, Photo)); #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_; + _tmp33_ = _tmp32_; #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp37_ != NULL; + _tmp34_ = _tmp33_ != NULL; #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp37_); + _backing_photo_row_unref0 (_tmp33_); #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp38_) { -#line 35068 "Photo.c" - LibraryPhoto* _tmp39_; - BackingPhotoRow* _tmp40_; - BackingPhotoRow* _tmp41_; - gint64 _tmp42_; + if (_tmp34_) { +#line 35445 "Photo.c" + LibraryPhoto* _tmp35_; + BackingPhotoRow* _tmp36_; + BackingPhotoRow* _tmp37_; + gint64 _tmp38_; #line 4558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = photo; + _tmp35_ = photo; #line 4558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo)); + _tmp36_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo)); #line 4558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = _tmp40_; + _tmp37_ = _tmp36_; #line 4558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_->filesize; + _tmp38_ = _tmp37_->filesize; #line 4558 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = _tmp42_; + _tmp30_ = _tmp38_; #line 4558 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp41_); -#line 35085 "Photo.c" + _backing_photo_row_unref0 (_tmp37_); +#line 35462 "Photo.c" } else { #line 4559 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = (gint64) -1; -#line 35089 "Photo.c" + _tmp30_ = (gint64) -1; +#line 35466 "Photo.c" } #line 4557 "/home/jens/Source/shotwell/src/Photo.vala" - editable_filesize = _tmp34_; + editable_filesize = _tmp30_; #line 4560 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = self->priv->filesize_to_photo; + _tmp39_ = self->priv->filesize_to_photo; #line 4560 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = master_filesize; + _tmp40_ = master_filesize; #line 4560 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = photo; + _tmp41_ = photo; #line 4560 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp43_, &_tmp44_, _tmp45_); + gee_multi_map_set (_tmp39_, &_tmp40_, _tmp41_); #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = self->priv->photo_to_master_filesize; + _tmp42_ = self->priv->photo_to_master_filesize; #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = photo; + _tmp43_ = photo; #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = master_filesize; + _tmp44_ = master_filesize; #line 4561 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp47_, &_tmp48_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp43_, &_tmp44_); #line 4562 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = editable_filesize; + _tmp45_ = editable_filesize; #line 4562 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp49_ >= ((gint64) 0)) { -#line 35113 "Photo.c" - GeeMultiMap* _tmp50_; + if (_tmp45_ >= ((gint64) 0)) { +#line 35490 "Photo.c" + GeeMultiMap* _tmp46_; + gint64 _tmp47_; + LibraryPhoto* _tmp48_; + GeeHashMap* _tmp49_; + LibraryPhoto* _tmp50_; gint64 _tmp51_; - LibraryPhoto* _tmp52_; - GeeHashMap* _tmp53_; - LibraryPhoto* _tmp54_; - gint64 _tmp55_; #line 4563 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = self->priv->filesize_to_photo; + _tmp46_ = self->priv->filesize_to_photo; #line 4563 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = editable_filesize; + _tmp47_ = editable_filesize; #line 4563 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = photo; + _tmp48_ = photo; #line 4563 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp50_, &_tmp51_, _tmp52_); + gee_multi_map_set (_tmp46_, &_tmp47_, _tmp48_); #line 4564 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = self->priv->photo_to_editable_filesize; + _tmp49_ = self->priv->photo_to_editable_filesize; #line 4564 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = photo; + _tmp50_ = photo; #line 4564 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = editable_filesize; + _tmp51_ = editable_filesize; #line 4564 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp54_, &_tmp55_); -#line 35136 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp50_, &_tmp51_); +#line 35513 "Photo.c" } #line 4567 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = photo; + _tmp52_ = photo; #line 4567 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PHOTO, Photo)); + _tmp53_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_PHOTO, Photo)); #line 4567 "/home/jens/Source/shotwell/src/Photo.vala" - raw_rows = _tmp57_; + raw_rows = _tmp53_; #line 4568 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = raw_rows; + _tmp54_ = raw_rows; #line 4568 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp58_ != NULL) { -#line 35148 "Photo.c" + if (_tmp54_ != NULL) { +#line 35525 "Photo.c" { GeeIterator* _row_it = NULL; - GeeCollection* _tmp59_; - GeeIterator* _tmp60_; + GeeCollection* _tmp55_; + GeeIterator* _tmp56_; #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = raw_rows; + _tmp55_ = raw_rows; #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp56_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _row_it = _tmp60_; + _row_it = _tmp56_; #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35161 "Photo.c" - GeeIterator* _tmp61_; - gboolean _tmp62_; +#line 35538 "Photo.c" + GeeIterator* _tmp57_; BackingPhotoRow* row = NULL; - GeeIterator* _tmp63_; - gpointer _tmp64_; - BackingPhotoRow* _tmp65_; - gint64 _tmp66_; -#line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _row_it; + GeeIterator* _tmp58_; + gpointer _tmp59_; + BackingPhotoRow* _tmp60_; + gint64 _tmp61_; #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = gee_iterator_next (_tmp61_); + _tmp57_ = _row_it; #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp62_) { + if (!gee_iterator_next (_tmp57_)) { #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35177 "Photo.c" +#line 35551 "Photo.c" } #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = _row_it; + _tmp58_ = _row_it; #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = gee_iterator_get (_tmp63_); + _tmp59_ = gee_iterator_get (_tmp58_); #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" - row = (BackingPhotoRow*) _tmp64_; + row = (BackingPhotoRow*) _tmp59_; #line 4570 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = row; + _tmp60_ = row; #line 4570 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = _tmp65_->filesize; + _tmp61_ = _tmp60_->filesize; #line 4570 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp66_ >= ((gint64) 0)) { -#line 35191 "Photo.c" - GeeMultiMap* _tmp67_; + if (_tmp61_ >= ((gint64) 0)) { +#line 35565 "Photo.c" + GeeMultiMap* _tmp62_; + BackingPhotoRow* _tmp63_; + gint64 _tmp64_; + LibraryPhoto* _tmp65_; + GeeMultiMap* _tmp66_; + LibraryPhoto* _tmp67_; BackingPhotoRow* _tmp68_; gint64 _tmp69_; - LibraryPhoto* _tmp70_; - GeeMultiMap* _tmp71_; - LibraryPhoto* _tmp72_; - BackingPhotoRow* _tmp73_; - gint64 _tmp74_; #line 4571 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = self->priv->filesize_to_photo; + _tmp62_ = self->priv->filesize_to_photo; #line 4571 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = row; + _tmp63_ = row; #line 4571 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = _tmp68_->filesize; + _tmp64_ = _tmp63_->filesize; #line 4571 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = photo; + _tmp65_ = photo; #line 4571 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp67_, &_tmp69_, _tmp70_); + gee_multi_map_set (_tmp62_, &_tmp64_, _tmp65_); #line 4572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = self->priv->photo_to_raw_development_filesize; + _tmp66_ = self->priv->photo_to_raw_development_filesize; #line 4572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = photo; + _tmp67_ = photo; #line 4572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = row; + _tmp68_ = row; #line 4572 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = _tmp73_->filesize; + _tmp69_ = _tmp68_->filesize; #line 4572 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp71_, _tmp72_, &_tmp74_); -#line 35220 "Photo.c" + gee_multi_map_set (_tmp66_, _tmp67_, &_tmp69_); +#line 35594 "Photo.c" } #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35224 "Photo.c" +#line 35598 "Photo.c" } #line 4569 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35228 "Photo.c" +#line 35602 "Photo.c" } } #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" @@ -35242,392 +35616,378 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _g_object_unref0 (photo); #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 35241 "Photo.c" +#line 35615 "Photo.c" } #line 4542 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 35245 "Photo.c" +#line 35619 "Photo.c" } } #line 4579 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = removed; -#line 4579 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp75_ != NULL) { -#line 35252 "Photo.c" + if (removed != NULL) { +#line 35624 "Photo.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp76_; - GeeIterator* _tmp77_; -#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = removed; + GeeIterator* _tmp70_; #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = gee_iterable_iterator (_tmp76_); + _tmp70_ = gee_iterable_iterator (removed); #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _object_it = _tmp77_; + _object_it = _tmp70_; #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35265 "Photo.c" - GeeIterator* _tmp78_; - gboolean _tmp79_; +#line 35634 "Photo.c" + GeeIterator* _tmp71_; DataObject* object = NULL; - GeeIterator* _tmp80_; - gpointer _tmp81_; + GeeIterator* _tmp72_; + gpointer _tmp73_; LibraryPhoto* photo = NULL; - DataObject* _tmp82_; - LibraryPhoto* _tmp83_; + DataObject* _tmp74_; + LibraryPhoto* _tmp75_; GFile* editable = NULL; - LibraryPhoto* _tmp84_; - GFile* _tmp85_; - GFile* _tmp86_; - LibraryPhoto* _tmp94_; - guint _tmp95_; + LibraryPhoto* _tmp76_; + GFile* _tmp77_; + GFile* _tmp78_; + LibraryPhoto* _tmp86_; + guint _tmp87_; GeeCollection* raw_list = NULL; - LibraryPhoto* _tmp96_; - GeeCollection* _tmp97_; - GeeCollection* _tmp98_; - LibraryPhoto* _tmp107_; - guint _tmp108_; + LibraryPhoto* _tmp88_; + GeeCollection* _tmp89_; + GeeCollection* _tmp90_; + LibraryPhoto* _tmp98_; + guint _tmp99_; gint64 master_filesize = 0LL; - LibraryPhoto* _tmp109_; - BackingPhotoRow* _tmp110_; - BackingPhotoRow* _tmp111_; - gint64 _tmp112_; - gint64 _tmp113_; - gint64 _tmp114_ = 0LL; - LibraryPhoto* _tmp115_; - BackingPhotoRow* _tmp116_; - BackingPhotoRow* _tmp117_; - gboolean _tmp118_; + LibraryPhoto* _tmp100_; + BackingPhotoRow* _tmp101_; + BackingPhotoRow* _tmp102_; + gint64 _tmp103_; + gint64 _tmp104_; + gint64 _tmp105_ = 0LL; + LibraryPhoto* _tmp106_; + BackingPhotoRow* _tmp107_; + BackingPhotoRow* _tmp108_; + gboolean _tmp109_; gint64 editable_filesize = 0LL; - GeeMultiMap* _tmp123_; - gint64 _tmp124_; - LibraryPhoto* _tmp125_; - GeeHashMap* _tmp126_; - LibraryPhoto* _tmp127_; - gint64 _tmp128_; + GeeMultiMap* _tmp114_; + gint64 _tmp115_; + LibraryPhoto* _tmp116_; + GeeHashMap* _tmp117_; + LibraryPhoto* _tmp118_; + gint64 _tmp119_; GeeCollection* raw_rows = NULL; - LibraryPhoto* _tmp134_; - GeeCollection* _tmp135_; - GeeCollection* _tmp136_; -#line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = _object_it; + LibraryPhoto* _tmp125_; + GeeCollection* _tmp126_; + GeeCollection* _tmp127_; #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = gee_iterator_next (_tmp78_); + _tmp71_ = _object_it; #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp79_) { + if (!gee_iterator_next (_tmp71_)) { #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35316 "Photo.c" +#line 35682 "Photo.c" } #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = _object_it; + _tmp72_ = _object_it; #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = gee_iterator_get (_tmp80_); + _tmp73_ = gee_iterator_get (_tmp72_); #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" - object = (DataObject*) _tmp81_; + object = (DataObject*) _tmp73_; #line 4581 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = object; + _tmp74_ = object; #line 4581 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp75_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 4581 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp83_; + photo = _tmp75_; #line 4583 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = photo; + _tmp76_ = photo; #line 4583 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_PHOTO, Photo)); + _tmp77_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_PHOTO, Photo)); #line 4583 "/home/jens/Source/shotwell/src/Photo.vala" - editable = _tmp85_; + editable = _tmp77_; #line 4584 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = editable; + _tmp78_ = editable; #line 4584 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp86_ != NULL) { -#line 35340 "Photo.c" + if (_tmp78_ != NULL) { +#line 35706 "Photo.c" gboolean is_removed = FALSE; - GeeHashMap* _tmp87_; - LibraryPhoto* _tmp88_; - GFile* _tmp89_; - GFile* _tmp90_; - gboolean _tmp91_; - gboolean _tmp92_; - gboolean _tmp93_; + GeeHashMap* _tmp79_; + LibraryPhoto* _tmp80_; + GFile* _tmp81_; + GFile* _tmp82_; + gboolean _tmp83_; + gboolean _tmp84_; + gboolean _tmp85_; #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = self->priv->by_editable_file; + _tmp79_ = self->priv->by_editable_file; #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = photo; + _tmp80_ = photo; #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_PHOTO, Photo)); + _tmp81_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_PHOTO, Photo)); #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tmp89_; + _tmp82_ = _tmp81_; #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp90_, NULL); + _tmp83_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp82_, NULL); #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = _tmp91_; + _tmp84_ = _tmp83_; #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp90_); + _g_object_unref0 (_tmp82_); #line 4585 "/home/jens/Source/shotwell/src/Photo.vala" - is_removed = _tmp92_; + is_removed = _tmp84_; #line 4586 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = is_removed; + _tmp85_ = is_removed; #line 4586 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp93_, "is_removed"); -#line 35369 "Photo.c" + _vala_assert (_tmp85_, "is_removed"); +#line 35735 "Photo.c" } #line 4588 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = photo; + _tmp86_ = photo; #line 4588 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp95_, NULL, FALSE); + g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp87_, NULL, FALSE); #line 4588 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp95_, 0, NULL, (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp87_, 0, NULL, (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self); #line 4590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = photo; + _tmp88_ = photo; #line 4590 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_PHOTO, Photo)); + _tmp89_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_PHOTO, Photo)); #line 4590 "/home/jens/Source/shotwell/src/Photo.vala" - raw_list = _tmp97_; + raw_list = _tmp89_; #line 4591 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp98_ = raw_list; + _tmp90_ = raw_list; #line 4591 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp98_ != NULL) { -#line 35387 "Photo.c" + if (_tmp90_ != NULL) { +#line 35753 "Photo.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp99_; - GeeIterator* _tmp100_; + GeeCollection* _tmp91_; + GeeIterator* _tmp92_; #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp99_ = raw_list; + _tmp91_ = raw_list; #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp100_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp92_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp100_; + _f_it = _tmp92_; #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35400 "Photo.c" - GeeIterator* _tmp101_; - gboolean _tmp102_; +#line 35766 "Photo.c" + GeeIterator* _tmp93_; GFile* f = NULL; - GeeIterator* _tmp103_; - gpointer _tmp104_; - GeeHashMap* _tmp105_; - GFile* _tmp106_; + GeeIterator* _tmp94_; + gpointer _tmp95_; + GeeHashMap* _tmp96_; + GFile* _tmp97_; #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp101_ = _f_it; + _tmp93_ = _f_it; #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp102_ = gee_iterator_next (_tmp101_); -#line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp102_) { + if (!gee_iterator_next (_tmp93_)) { #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35416 "Photo.c" +#line 35779 "Photo.c" } #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp103_ = _f_it; + _tmp94_ = _f_it; #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp104_ = gee_iterator_get (_tmp103_); + _tmp95_ = gee_iterator_get (_tmp94_); #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp104_; + f = (GFile*) _tmp95_; #line 4593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp105_ = self->priv->by_raw_development_file; + _tmp96_ = self->priv->by_raw_development_file; #line 4593 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp106_ = f; + _tmp97_ = f; #line 4593 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp106_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp97_, NULL); #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 35432 "Photo.c" +#line 35795 "Photo.c" } #line 4592 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 35436 "Photo.c" +#line 35799 "Photo.c" } } #line 4594 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp107_ = photo; + _tmp98_ = photo; #line 4594 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp108_, NULL, FALSE); + g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp99_, NULL, FALSE); #line 4594 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp108_, 0, NULL, (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp99_, 0, NULL, (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self); #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp109_ = photo; + _tmp100_ = photo; #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp110_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_PHOTO, Photo)); + _tmp101_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, TYPE_PHOTO, Photo)); #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp111_ = _tmp110_; + _tmp102_ = _tmp101_; #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp112_ = _tmp111_->filesize; + _tmp103_ = _tmp102_->filesize; #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp113_ = _tmp112_; + _tmp104_ = _tmp103_; #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp111_); + _backing_photo_row_unref0 (_tmp102_); #line 4596 "/home/jens/Source/shotwell/src/Photo.vala" - master_filesize = _tmp113_; + master_filesize = _tmp104_; #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp115_ = photo; + _tmp106_ = photo; #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp116_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, TYPE_PHOTO, Photo)); + _tmp107_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, TYPE_PHOTO, Photo)); #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp117_ = _tmp116_; + _tmp108_ = _tmp107_; #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp118_ = _tmp117_ != NULL; + _tmp109_ = _tmp108_ != NULL; #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp117_); + _backing_photo_row_unref0 (_tmp108_); #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp118_) { -#line 35471 "Photo.c" - LibraryPhoto* _tmp119_; - BackingPhotoRow* _tmp120_; - BackingPhotoRow* _tmp121_; - gint64 _tmp122_; + if (_tmp109_) { +#line 35834 "Photo.c" + LibraryPhoto* _tmp110_; + BackingPhotoRow* _tmp111_; + BackingPhotoRow* _tmp112_; + gint64 _tmp113_; #line 4598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp119_ = photo; + _tmp110_ = photo; #line 4598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp120_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_PHOTO, Photo)); + _tmp111_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, TYPE_PHOTO, Photo)); #line 4598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp121_ = _tmp120_; + _tmp112_ = _tmp111_; #line 4598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp122_ = _tmp121_->filesize; + _tmp113_ = _tmp112_->filesize; #line 4598 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = _tmp122_; + _tmp105_ = _tmp113_; #line 4598 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp121_); -#line 35488 "Photo.c" + _backing_photo_row_unref0 (_tmp112_); +#line 35851 "Photo.c" } else { #line 4599 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp114_ = (gint64) -1; -#line 35492 "Photo.c" + _tmp105_ = (gint64) -1; +#line 35855 "Photo.c" } #line 4597 "/home/jens/Source/shotwell/src/Photo.vala" - editable_filesize = _tmp114_; + editable_filesize = _tmp105_; #line 4600 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp123_ = self->priv->filesize_to_photo; + _tmp114_ = self->priv->filesize_to_photo; #line 4600 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp124_ = master_filesize; + _tmp115_ = master_filesize; #line 4600 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp125_ = photo; + _tmp116_ = photo; #line 4600 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp123_, &_tmp124_, _tmp125_); + gee_multi_map_remove (_tmp114_, &_tmp115_, _tmp116_); #line 4601 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp126_ = self->priv->photo_to_master_filesize; + _tmp117_ = self->priv->photo_to_master_filesize; #line 4601 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp127_ = photo; + _tmp118_ = photo; #line 4601 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp127_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp118_, NULL); #line 4602 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp128_ = editable_filesize; + _tmp119_ = editable_filesize; #line 4602 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp128_ >= ((gint64) 0)) { -#line 35514 "Photo.c" - GeeMultiMap* _tmp129_; - gint64 _tmp130_; - LibraryPhoto* _tmp131_; - GeeHashMap* _tmp132_; - LibraryPhoto* _tmp133_; + if (_tmp119_ >= ((gint64) 0)) { +#line 35877 "Photo.c" + GeeMultiMap* _tmp120_; + gint64 _tmp121_; + LibraryPhoto* _tmp122_; + GeeHashMap* _tmp123_; + LibraryPhoto* _tmp124_; #line 4603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp129_ = self->priv->filesize_to_photo; + _tmp120_ = self->priv->filesize_to_photo; #line 4603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp130_ = editable_filesize; + _tmp121_ = editable_filesize; #line 4603 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp131_ = photo; + _tmp122_ = photo; #line 4603 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp129_, &_tmp130_, _tmp131_); + gee_multi_map_remove (_tmp120_, &_tmp121_, _tmp122_); #line 4604 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp132_ = self->priv->photo_to_editable_filesize; + _tmp123_ = self->priv->photo_to_editable_filesize; #line 4604 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp133_ = photo; + _tmp124_ = photo; #line 4604 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp133_, NULL); -#line 35534 "Photo.c" + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp124_, NULL); +#line 35897 "Photo.c" } #line 4607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp134_ = photo; + _tmp125_ = photo; #line 4607 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp135_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, TYPE_PHOTO, Photo)); + _tmp126_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_PHOTO, Photo)); #line 4607 "/home/jens/Source/shotwell/src/Photo.vala" - raw_rows = _tmp135_; + raw_rows = _tmp126_; #line 4608 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp136_ = raw_rows; + _tmp127_ = raw_rows; #line 4608 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp136_ != NULL) { -#line 35546 "Photo.c" + if (_tmp127_ != NULL) { +#line 35909 "Photo.c" { GeeIterator* _row_it = NULL; - GeeCollection* _tmp137_; - GeeIterator* _tmp138_; + GeeCollection* _tmp128_; + GeeIterator* _tmp129_; #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp137_ = raw_rows; + _tmp128_ = raw_rows; #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp138_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp129_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _row_it = _tmp138_; + _row_it = _tmp129_; #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35559 "Photo.c" - GeeIterator* _tmp139_; - gboolean _tmp140_; +#line 35922 "Photo.c" + GeeIterator* _tmp130_; BackingPhotoRow* row = NULL; - GeeIterator* _tmp141_; - gpointer _tmp142_; - BackingPhotoRow* _tmp143_; - gint64 _tmp144_; + GeeIterator* _tmp131_; + gpointer _tmp132_; + BackingPhotoRow* _tmp133_; + gint64 _tmp134_; #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp139_ = _row_it; + _tmp130_ = _row_it; #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp140_ = gee_iterator_next (_tmp139_); -#line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp140_) { + if (!gee_iterator_next (_tmp130_)) { #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35575 "Photo.c" +#line 35935 "Photo.c" } #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp141_ = _row_it; + _tmp131_ = _row_it; #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp142_ = gee_iterator_get (_tmp141_); + _tmp132_ = gee_iterator_get (_tmp131_); #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" - row = (BackingPhotoRow*) _tmp142_; + row = (BackingPhotoRow*) _tmp132_; #line 4610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp143_ = row; + _tmp133_ = row; #line 4610 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp144_ = _tmp143_->filesize; + _tmp134_ = _tmp133_->filesize; #line 4610 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp144_ >= ((gint64) 0)) { -#line 35589 "Photo.c" - GeeMultiMap* _tmp145_; - BackingPhotoRow* _tmp146_; - gint64 _tmp147_; - LibraryPhoto* _tmp148_; - GeeMultiMap* _tmp149_; - LibraryPhoto* _tmp150_; - BackingPhotoRow* _tmp151_; - gint64 _tmp152_; + if (_tmp134_ >= ((gint64) 0)) { +#line 35949 "Photo.c" + GeeMultiMap* _tmp135_; + BackingPhotoRow* _tmp136_; + gint64 _tmp137_; + LibraryPhoto* _tmp138_; + GeeMultiMap* _tmp139_; + LibraryPhoto* _tmp140_; + BackingPhotoRow* _tmp141_; + gint64 _tmp142_; #line 4611 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp145_ = self->priv->filesize_to_photo; + _tmp135_ = self->priv->filesize_to_photo; #line 4611 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp146_ = row; + _tmp136_ = row; #line 4611 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp147_ = _tmp146_->filesize; + _tmp137_ = _tmp136_->filesize; #line 4611 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp148_ = photo; + _tmp138_ = photo; #line 4611 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp145_, &_tmp147_, _tmp148_); + gee_multi_map_remove (_tmp135_, &_tmp137_, _tmp138_); #line 4612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp149_ = self->priv->photo_to_raw_development_filesize; + _tmp139_ = self->priv->photo_to_raw_development_filesize; #line 4612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp150_ = photo; + _tmp140_ = photo; #line 4612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp151_ = row; + _tmp141_ = row; #line 4612 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp152_ = _tmp151_->filesize; + _tmp142_ = _tmp141_->filesize; #line 4612 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp149_, _tmp150_, &_tmp152_); -#line 35618 "Photo.c" + gee_multi_map_remove (_tmp139_, _tmp140_, &_tmp142_); +#line 35978 "Photo.c" } #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35622 "Photo.c" +#line 35982 "Photo.c" } #line 4609 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35626 "Photo.c" +#line 35986 "Photo.c" } } #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" @@ -35640,26 +36000,25 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo _g_object_unref0 (photo); #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 35639 "Photo.c" +#line 35999 "Photo.c" } #line 4580 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 35643 "Photo.c" +#line 36003 "Photo.c" } } #line 4619 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp153_ = added; -#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp154_ = removed; -#line 4619 "/home/jens/Source/shotwell/src/Photo.vala" - DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp153_, _tmp154_); -#line 35652 "Photo.c" + 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), added, removed); +#line 36008 "Photo.c" } -static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, Photo* photo, GFile* old_file, GFile* new_file) { - GFile* _tmp0_; - GFile* _tmp5_; +static void +library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, + Photo* photo, + GFile* old_file, + GFile* new_file) +{ #line 4622 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4622 "/home/jens/Source/shotwell/src/Photo.vala" @@ -35669,334 +36028,309 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo #line 4622 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file)); #line 4623 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = old_file; -#line 4623 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != NULL) { -#line 35671 "Photo.c" + if (old_file != NULL) { +#line 36028 "Photo.c" gboolean is_removed = FALSE; - GeeHashMap* _tmp1_; - GFile* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; -#line 4624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = self->priv->by_editable_file; + GeeHashMap* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; #line 4624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = old_file; + _tmp0_ = self->priv->by_editable_file; #line 4624 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, NULL); + _tmp1_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), old_file, NULL); #line 4624 "/home/jens/Source/shotwell/src/Photo.vala" - is_removed = _tmp3_; + is_removed = _tmp1_; #line 4625 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = is_removed; + _tmp2_ = is_removed; #line 4625 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp4_, "is_removed"); -#line 35689 "Photo.c" + _vala_assert (_tmp2_, "is_removed"); +#line 36043 "Photo.c" } #line 4628 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = new_file; -#line 4628 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_ != NULL) { -#line 35695 "Photo.c" - GeeHashMap* _tmp6_; - GFile* _tmp7_; - Photo* _tmp8_; -#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->priv->by_editable_file; -#line 4629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = new_file; + if (new_file != NULL) { +#line 36047 "Photo.c" + GeeHashMap* _tmp3_; #line 4629 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo; + _tmp3_ = self->priv->by_editable_file; #line 4629 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 35707 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), new_file, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_LIBRARY_PHOTO, LibraryPhoto)); +#line 36053 "Photo.c" } } -static void library_photo_source_collection_on_raw_development_modified (LibraryPhotoSourceCollection* self, Photo* _photo) { +static void +library_photo_source_collection_on_raw_development_modified (LibraryPhotoSourceCollection* self, + Photo* _photo) +{ LibraryPhoto* photo = NULL; - Photo* _tmp0_; + LibraryPhoto* _tmp0_; LibraryPhoto* _tmp1_; - LibraryPhoto* _tmp2_; - GeeMultiMap* _tmp3_; - LibraryPhoto* _tmp4_; - gboolean _tmp5_; + GeeMultiMap* _tmp2_; + LibraryPhoto* _tmp3_; GeeCollection* raw_list = NULL; - LibraryPhoto* _tmp23_; - GeeCollection* _tmp24_; - GeeCollection* _tmp25_; + LibraryPhoto* _tmp20_; + GeeCollection* _tmp21_; + GeeCollection* _tmp22_; GeeCollection* raw_rows = NULL; - LibraryPhoto* _tmp35_; - GeeCollection* _tmp36_; - GeeCollection* _tmp37_; + LibraryPhoto* _tmp31_; + GeeCollection* _tmp32_; + GeeCollection* _tmp33_; #line 4632 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4632 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (_photo)); #line 4633 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _photo; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_photo, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _photo) : NULL); #line 4633 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL); -#line 4633 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp1_; + photo = _tmp0_; #line 4634 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo; + _tmp1_ = photo; #line 4634 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 4635 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4635 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 35746 "Photo.c" +#line 36091 "Photo.c" } #line 4638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->photo_to_raw_development_filesize; -#line 4638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo; + _tmp2_ = self->priv->photo_to_raw_development_filesize; #line 4638 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_); + _tmp3_ = photo; #line 4638 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 35756 "Photo.c" - GeeMultiMap* _tmp21_; - LibraryPhoto* _tmp22_; + if (gee_multi_map_contains (_tmp2_, _tmp3_)) { +#line 36099 "Photo.c" + GeeMultiMap* _tmp18_; + LibraryPhoto* _tmp19_; { GeeIterator* _s_it = NULL; - GeeMultiMap* _tmp6_; - LibraryPhoto* _tmp7_; - GeeCollection* _tmp8_; - GeeCollection* _tmp9_; - GeeIterator* _tmp10_; - GeeIterator* _tmp11_; + GeeMultiMap* _tmp4_; + LibraryPhoto* _tmp5_; + GeeCollection* _tmp6_; + GeeCollection* _tmp7_; + GeeIterator* _tmp8_; + GeeIterator* _tmp9_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->priv->photo_to_raw_development_filesize; + _tmp4_ = self->priv->photo_to_raw_development_filesize; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo; + _tmp5_ = photo; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_); + _tmp6_ = gee_multi_map_get (_tmp4_, _tmp5_); #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp7_); #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _s_it = _tmp11_; + _s_it = _tmp9_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35785 "Photo.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 36128 "Photo.c" + GeeIterator* _tmp10_; gint64 s = 0LL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - gint64* _tmp16_; - gint64 _tmp17_; - GeeMultiMap* _tmp18_; - gint64 _tmp19_; - LibraryPhoto* _tmp20_; -#line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _s_it; + GeeIterator* _tmp11_; + gpointer _tmp12_; + gint64* _tmp13_; + gint64 _tmp14_; + GeeMultiMap* _tmp15_; + gint64 _tmp16_; + LibraryPhoto* _tmp17_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp10_ = _s_it; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp10_)) { #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35804 "Photo.c" +#line 36144 "Photo.c" } #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _s_it; + _tmp11_ = _s_it; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = (gint64*) _tmp15_; + _tmp13_ = (gint64*) _tmp12_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = *_tmp16_; + _tmp14_ = *_tmp13_; #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp13_); #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" - s = _tmp17_; + s = _tmp14_; #line 4640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->priv->filesize_to_photo; + _tmp15_ = self->priv->filesize_to_photo; #line 4640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = s; + _tmp16_ = s; #line 4640 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = photo; + _tmp17_ = photo; #line 4640 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp18_, &_tmp19_, _tmp20_); -#line 35826 "Photo.c" + gee_multi_map_remove (_tmp15_, &_tmp16_, _tmp17_); +#line 36166 "Photo.c" } #line 4639 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_s_it); -#line 35830 "Photo.c" +#line 36170 "Photo.c" } #line 4641 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = self->priv->photo_to_raw_development_filesize; + _tmp18_ = self->priv->photo_to_raw_development_filesize; #line 4641 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo; + _tmp19_ = photo; #line 4641 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove_all (_tmp21_, _tmp22_); -#line 35838 "Photo.c" + gee_multi_map_remove_all (_tmp18_, _tmp19_); +#line 36178 "Photo.c" } #line 4645 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo; + _tmp20_ = photo; #line 4645 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo)); + _tmp21_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); #line 4645 "/home/jens/Source/shotwell/src/Photo.vala" - raw_list = _tmp24_; + raw_list = _tmp21_; #line 4646 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = raw_list; + _tmp22_ = raw_list; #line 4646 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp25_ != NULL) { -#line 35850 "Photo.c" + if (_tmp22_ != NULL) { +#line 36190 "Photo.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp26_; - GeeIterator* _tmp27_; + GeeCollection* _tmp23_; + GeeIterator* _tmp24_; #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = raw_list; + _tmp23_ = raw_list; #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp27_; + _f_it = _tmp24_; #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35863 "Photo.c" - GeeIterator* _tmp28_; - gboolean _tmp29_; +#line 36203 "Photo.c" + GeeIterator* _tmp25_; GFile* f = NULL; - GeeIterator* _tmp30_; - gpointer _tmp31_; - GeeHashMap* _tmp32_; - GFile* _tmp33_; - LibraryPhoto* _tmp34_; -#line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _f_it; + GeeIterator* _tmp26_; + gpointer _tmp27_; + GeeHashMap* _tmp28_; + GFile* _tmp29_; + LibraryPhoto* _tmp30_; #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = gee_iterator_next (_tmp28_); + _tmp25_ = _f_it; #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp29_) { + if (!gee_iterator_next (_tmp25_)) { #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35880 "Photo.c" +#line 36217 "Photo.c" } #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _f_it; + _tmp26_ = _f_it; #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = gee_iterator_get (_tmp30_); + _tmp27_ = gee_iterator_get (_tmp26_); #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp31_; + f = (GFile*) _tmp27_; #line 4648 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->priv->by_raw_development_file; + _tmp28_ = self->priv->by_raw_development_file; #line 4648 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = f; + _tmp29_ = f; #line 4648 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = photo; + _tmp30_ = photo; #line 4648 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, _tmp30_); #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 35898 "Photo.c" +#line 36235 "Photo.c" } #line 4647 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 35902 "Photo.c" +#line 36239 "Photo.c" } } #line 4650 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo; + _tmp31_ = photo; #line 4650 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo)); + _tmp32_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO, Photo)); #line 4650 "/home/jens/Source/shotwell/src/Photo.vala" - raw_rows = _tmp36_; + raw_rows = _tmp32_; #line 4651 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = raw_rows; + _tmp33_ = raw_rows; #line 4651 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp37_ != NULL) { -#line 35915 "Photo.c" + if (_tmp33_ != NULL) { +#line 36252 "Photo.c" { GeeIterator* _row_it = NULL; - GeeCollection* _tmp38_; - GeeIterator* _tmp39_; + GeeCollection* _tmp34_; + GeeIterator* _tmp35_; #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = raw_rows; + _tmp34_ = raw_rows; #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp35_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _row_it = _tmp39_; + _row_it = _tmp35_; #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 35928 "Photo.c" - GeeIterator* _tmp40_; - gboolean _tmp41_; +#line 36265 "Photo.c" + GeeIterator* _tmp36_; BackingPhotoRow* row = NULL; - GeeIterator* _tmp42_; - gpointer _tmp43_; - BackingPhotoRow* _tmp44_; - gint64 _tmp45_; -#line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _row_it; + GeeIterator* _tmp37_; + gpointer _tmp38_; + BackingPhotoRow* _tmp39_; + gint64 _tmp40_; #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = gee_iterator_next (_tmp40_); + _tmp36_ = _row_it; #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp41_) { + if (!gee_iterator_next (_tmp36_)) { #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 35944 "Photo.c" +#line 36278 "Photo.c" } #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _row_it; + _tmp37_ = _row_it; #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = gee_iterator_get (_tmp42_); + _tmp38_ = gee_iterator_get (_tmp37_); #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" - row = (BackingPhotoRow*) _tmp43_; + row = (BackingPhotoRow*) _tmp38_; #line 4653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = row; + _tmp39_ = row; #line 4653 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _tmp44_->filesize; + _tmp40_ = _tmp39_->filesize; #line 4653 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp45_ > ((gint64) 0)) { -#line 35958 "Photo.c" - GeeMultiMap* _tmp46_; + if (_tmp40_ > ((gint64) 0)) { +#line 36292 "Photo.c" + GeeMultiMap* _tmp41_; + BackingPhotoRow* _tmp42_; + gint64 _tmp43_; + LibraryPhoto* _tmp44_; + GeeMultiMap* _tmp45_; + LibraryPhoto* _tmp46_; BackingPhotoRow* _tmp47_; gint64 _tmp48_; - LibraryPhoto* _tmp49_; - GeeMultiMap* _tmp50_; - LibraryPhoto* _tmp51_; - BackingPhotoRow* _tmp52_; - gint64 _tmp53_; #line 4654 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = self->priv->filesize_to_photo; + _tmp41_ = self->priv->filesize_to_photo; #line 4654 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = row; + _tmp42_ = row; #line 4654 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp47_->filesize; + _tmp43_ = _tmp42_->filesize; #line 4654 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = photo; + _tmp44_ = photo; #line 4654 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp46_, &_tmp48_, _tmp49_); + gee_multi_map_set (_tmp41_, &_tmp43_, _tmp44_); #line 4655 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = self->priv->photo_to_raw_development_filesize; + _tmp45_ = self->priv->photo_to_raw_development_filesize; #line 4655 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = photo; + _tmp46_ = photo; #line 4655 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = row; + _tmp47_ = row; #line 4655 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp52_->filesize; + _tmp48_ = _tmp47_->filesize; #line 4655 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp50_, _tmp51_, &_tmp53_); -#line 35987 "Photo.c" + gee_multi_map_set (_tmp45_, _tmp46_, &_tmp48_); +#line 36321 "Photo.c" } #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 35991 "Photo.c" +#line 36325 "Photo.c" } #line 4652 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 35995 "Photo.c" +#line 36329 "Photo.c" } } #line 4632 "/home/jens/Source/shotwell/src/Photo.vala" @@ -36005,347 +36339,333 @@ static void library_photo_source_collection_on_raw_development_modified (Library _g_object_unref0 (raw_list); #line 4632 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 36004 "Photo.c" +#line 36338 "Photo.c" } -static gpointer __int64_dup0 (gpointer self) { +static gpointer +__int64_dup0 (gpointer self) +{ #line 4671 "/home/jens/Source/shotwell/src/Photo.vala" return self ? _int64_dup (self) : NULL; -#line 36011 "Photo.c" +#line 36347 "Photo.c" } -static void library_photo_source_collection_real_items_altered (DataCollection* base, GeeMap* items) { +static void +library_photo_source_collection_real_items_altered (DataCollection* base, + GeeMap* items) +{ LibraryPhotoSourceCollection * self; - GeeMap* _tmp72_; #line 4661 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4661 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_MAP (items)); -#line 36022 "Photo.c" +#line 36360 "Photo.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = items; + _tmp0_ = gee_map_get_keys (items); #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = _tmp1_; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; -#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36049 "Photo.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 36384 "Photo.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; Alteration* alteration = NULL; - GeeMap* _tmp10_; - DataObject* _tmp11_; - gpointer _tmp12_; + DataObject* _tmp8_; + gpointer _tmp9_; LibraryPhoto* photo = NULL; - DataObject* _tmp13_; - LibraryPhoto* _tmp14_; - gboolean _tmp15_ = FALSE; - Alteration* _tmp16_; - gboolean _tmp17_; -#line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _object_it; + DataObject* _tmp10_; + LibraryPhoto* _tmp11_; + gboolean _tmp12_ = FALSE; + Alteration* _tmp13_; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36073 "Photo.c" +#line 36403 "Photo.c" } #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" - object = (DataObject*) _tmp9_; + object = (DataObject*) _tmp7_; #line 4663 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = items; -#line 4663 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = object; + _tmp8_ = object; #line 4663 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = gee_map_get (_tmp10_, _tmp11_); + _tmp9_ = gee_map_get (items, _tmp8_); #line 4663 "/home/jens/Source/shotwell/src/Photo.vala" - alteration = (Alteration*) _tmp12_; + alteration = (Alteration*) _tmp9_; #line 4665 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = object; + _tmp10_ = object; #line 4665 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 4665 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp14_; + photo = _tmp11_; #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = alteration; + _tmp13_ = alteration; #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = alteration_has_detail (_tmp16_, "image", "master"); + if (alteration_has_detail (_tmp13_, "image", "master")) { #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_) { -#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = TRUE; -#line 36103 "Photo.c" + _tmp12_ = TRUE; +#line 36429 "Photo.c" } else { - Alteration* _tmp18_; - gboolean _tmp19_; -#line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = alteration; + Alteration* _tmp14_; #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = alteration_has_detail (_tmp18_, "image", "editable"); + _tmp14_ = alteration; #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp19_; -#line 36113 "Photo.c" + _tmp12_ = alteration_has_detail (_tmp14_, "image", "editable"); +#line 36436 "Photo.c" } #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_) { -#line 36117 "Photo.c" + if (_tmp12_) { +#line 36440 "Photo.c" gint64 old_master_filesize = 0LL; - GeeHashMap* _tmp20_; - LibraryPhoto* _tmp21_; - gpointer _tmp22_; - gint64* _tmp23_; - gint64 _tmp24_; - gint64* _tmp25_ = NULL; - GeeHashMap* _tmp26_; - LibraryPhoto* _tmp27_; - gboolean _tmp28_; + GeeHashMap* _tmp15_; + LibraryPhoto* _tmp16_; + gpointer _tmp17_; + gint64* _tmp18_; + gint64 _tmp19_; + gint64* _tmp20_ = NULL; + GeeHashMap* _tmp21_; + LibraryPhoto* _tmp22_; gint64 old_editable_filesize = 0LL; - GeeHashMap* _tmp34_; - LibraryPhoto* _tmp35_; - GeeMultiMap* _tmp36_; - gint64 _tmp37_; - LibraryPhoto* _tmp38_; - gint64 _tmp39_; + GeeHashMap* _tmp28_; + LibraryPhoto* _tmp29_; + GeeMultiMap* _tmp30_; + gint64 _tmp31_; + LibraryPhoto* _tmp32_; + gint64 _tmp33_; gint64 master_filesize = 0LL; + LibraryPhoto* _tmp39_; + BackingPhotoRow* _tmp40_; + BackingPhotoRow* _tmp41_; + gint64 _tmp42_; + gint64 _tmp43_; + gint64 _tmp44_ = 0LL; LibraryPhoto* _tmp45_; BackingPhotoRow* _tmp46_; BackingPhotoRow* _tmp47_; - gint64 _tmp48_; - gint64 _tmp49_; - gint64 _tmp50_ = 0LL; - LibraryPhoto* _tmp51_; - BackingPhotoRow* _tmp52_; - BackingPhotoRow* _tmp53_; - gboolean _tmp54_; + gboolean _tmp48_; gint64 editable_filesize = 0LL; - GeeHashMap* _tmp59_; - LibraryPhoto* _tmp60_; - gint64 _tmp61_; - GeeMultiMap* _tmp62_; - gint64 _tmp63_; - LibraryPhoto* _tmp64_; - gint64 _tmp65_; + GeeHashMap* _tmp53_; + LibraryPhoto* _tmp54_; + gint64 _tmp55_; + GeeMultiMap* _tmp56_; + gint64 _tmp57_; + LibraryPhoto* _tmp58_; + gint64 _tmp59_; #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = self->priv->photo_to_master_filesize; + _tmp15_ = self->priv->photo_to_master_filesize; #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo; + _tmp16_ = photo; #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_); + _tmp17_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_); #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = (gint64*) _tmp22_; + _tmp18_ = (gint64*) _tmp17_; #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = *_tmp23_; + _tmp19_ = *_tmp18_; #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp18_); #line 4668 "/home/jens/Source/shotwell/src/Photo.vala" - old_master_filesize = _tmp24_; -#line 4669 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = self->priv->photo_to_editable_filesize; + old_master_filesize = _tmp19_; #line 4669 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = photo; + _tmp21_ = self->priv->photo_to_editable_filesize; #line 4669 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_); + _tmp22_ = photo; #line 4669 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp28_) { -#line 36176 "Photo.c" - GeeHashMap* _tmp29_; - LibraryPhoto* _tmp30_; - gpointer _tmp31_; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_)) { +#line 36496 "Photo.c" + GeeHashMap* _tmp23_; + LibraryPhoto* _tmp24_; + gpointer _tmp25_; #line 4670 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = self->priv->photo_to_editable_filesize; + _tmp23_ = self->priv->photo_to_editable_filesize; #line 4670 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = photo; + _tmp24_ = photo; #line 4670 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_); + _tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_); #line 4670 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp20_); #line 4670 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = (gint64*) _tmp31_; -#line 36190 "Photo.c" + _tmp20_ = (gint64*) _tmp25_; +#line 36510 "Photo.c" } else { - gint64 _tmp32_; - gint64* _tmp33_; + gint64 _tmp26_; + gint64* _tmp27_; #line 4671 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = (gint64) -1; + _tmp26_ = (gint64) -1; #line 4671 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = __int64_dup0 (&_tmp32_); + _tmp27_ = __int64_dup0 (&_tmp26_); #line 4671 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp20_); #line 4671 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp33_; -#line 36202 "Photo.c" + _tmp20_ = _tmp27_; +#line 36522 "Photo.c" } #line 4669 "/home/jens/Source/shotwell/src/Photo.vala" - old_editable_filesize = *_tmp25_; + old_editable_filesize = *_tmp20_; #line 4673 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = self->priv->photo_to_master_filesize; + _tmp28_ = self->priv->photo_to_master_filesize; #line 4673 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = photo; + _tmp29_ = photo; #line 4673 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, NULL); #line 4674 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = self->priv->filesize_to_photo; + _tmp30_ = self->priv->filesize_to_photo; #line 4674 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = old_master_filesize; + _tmp31_ = old_master_filesize; #line 4674 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = photo; + _tmp32_ = photo; #line 4674 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp36_, &_tmp37_, _tmp38_); + gee_multi_map_remove (_tmp30_, &_tmp31_, _tmp32_); #line 4675 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = old_editable_filesize; + _tmp33_ = old_editable_filesize; #line 4675 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp39_ >= ((gint64) 0)) { -#line 36224 "Photo.c" - GeeHashMap* _tmp40_; - LibraryPhoto* _tmp41_; - GeeMultiMap* _tmp42_; - gint64 _tmp43_; - LibraryPhoto* _tmp44_; + if (_tmp33_ >= ((gint64) 0)) { +#line 36544 "Photo.c" + GeeHashMap* _tmp34_; + LibraryPhoto* _tmp35_; + GeeMultiMap* _tmp36_; + gint64 _tmp37_; + LibraryPhoto* _tmp38_; #line 4676 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = self->priv->photo_to_editable_filesize; + _tmp34_ = self->priv->photo_to_editable_filesize; #line 4676 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = photo; + _tmp35_ = photo; #line 4676 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp41_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_, NULL); #line 4677 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = self->priv->filesize_to_photo; + _tmp36_ = self->priv->filesize_to_photo; #line 4677 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = old_editable_filesize; + _tmp37_ = old_editable_filesize; #line 4677 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = photo; + _tmp38_ = photo; #line 4677 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp42_, &_tmp43_, _tmp44_); -#line 36244 "Photo.c" + gee_multi_map_remove (_tmp36_, &_tmp37_, _tmp38_); +#line 36564 "Photo.c" } #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = photo; + _tmp39_ = photo; #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo)); + _tmp40_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo)); #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _tmp46_; + _tmp41_ = _tmp40_; #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _tmp47_->filesize; + _tmp42_ = _tmp41_->filesize; #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = _tmp48_; + _tmp43_ = _tmp42_; #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp47_); + _backing_photo_row_unref0 (_tmp41_); #line 4680 "/home/jens/Source/shotwell/src/Photo.vala" - master_filesize = _tmp49_; + master_filesize = _tmp43_; #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = photo; + _tmp45_ = photo; #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_PHOTO, Photo)); + _tmp46_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo)); #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp52_; + _tmp47_ = _tmp46_; #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = _tmp53_ != NULL; + _tmp48_ = _tmp47_ != NULL; #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp53_); + _backing_photo_row_unref0 (_tmp47_); #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp54_) { -#line 36272 "Photo.c" - LibraryPhoto* _tmp55_; - BackingPhotoRow* _tmp56_; - BackingPhotoRow* _tmp57_; - gint64 _tmp58_; + if (_tmp48_) { +#line 36592 "Photo.c" + LibraryPhoto* _tmp49_; + BackingPhotoRow* _tmp50_; + BackingPhotoRow* _tmp51_; + gint64 _tmp52_; #line 4682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = photo; + _tmp49_ = photo; #line 4682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo)); + _tmp50_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_PHOTO, Photo)); #line 4682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = _tmp56_; + _tmp51_ = _tmp50_; #line 4682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = _tmp57_->filesize; + _tmp52_ = _tmp51_->filesize; #line 4682 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = _tmp58_; + _tmp44_ = _tmp52_; #line 4682 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp57_); -#line 36289 "Photo.c" + _backing_photo_row_unref0 (_tmp51_); +#line 36609 "Photo.c" } else { #line 4683 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = (gint64) -1; -#line 36293 "Photo.c" + _tmp44_ = (gint64) -1; +#line 36613 "Photo.c" } #line 4681 "/home/jens/Source/shotwell/src/Photo.vala" - editable_filesize = _tmp50_; + editable_filesize = _tmp44_; #line 4684 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = self->priv->photo_to_master_filesize; + _tmp53_ = self->priv->photo_to_master_filesize; #line 4684 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = photo; + _tmp54_ = photo; #line 4684 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = master_filesize; + _tmp55_ = master_filesize; #line 4684 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, &_tmp61_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp54_, &_tmp55_); #line 4685 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = self->priv->filesize_to_photo; + _tmp56_ = self->priv->filesize_to_photo; #line 4685 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = master_filesize; + _tmp57_ = master_filesize; #line 4685 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = photo; + _tmp58_ = photo; #line 4685 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp62_, &_tmp63_, _tmp64_); + gee_multi_map_set (_tmp56_, &_tmp57_, _tmp58_); #line 4686 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = editable_filesize; + _tmp59_ = editable_filesize; #line 4686 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp65_ >= ((gint64) 0)) { -#line 36317 "Photo.c" - GeeHashMap* _tmp66_; - LibraryPhoto* _tmp67_; - gint64 _tmp68_; - GeeMultiMap* _tmp69_; - gint64 _tmp70_; - LibraryPhoto* _tmp71_; + if (_tmp59_ >= ((gint64) 0)) { +#line 36637 "Photo.c" + GeeHashMap* _tmp60_; + LibraryPhoto* _tmp61_; + gint64 _tmp62_; + GeeMultiMap* _tmp63_; + gint64 _tmp64_; + LibraryPhoto* _tmp65_; #line 4687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = self->priv->photo_to_editable_filesize; + _tmp60_ = self->priv->photo_to_editable_filesize; #line 4687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = photo; + _tmp61_ = photo; #line 4687 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = editable_filesize; + _tmp62_ = editable_filesize; #line 4687 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp67_, &_tmp68_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp61_, &_tmp62_); #line 4688 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = self->priv->filesize_to_photo; + _tmp63_ = self->priv->filesize_to_photo; #line 4688 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = editable_filesize; + _tmp64_ = editable_filesize; #line 4688 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = photo; + _tmp65_ = photo; #line 4688 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp69_, &_tmp70_, _tmp71_); -#line 36340 "Photo.c" + gee_multi_map_set (_tmp63_, &_tmp64_, _tmp65_); +#line 36660 "Photo.c" } #line 4667 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp25_); -#line 36344 "Photo.c" + _g_free0 (_tmp20_); +#line 36664 "Photo.c" } #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); @@ -36353,25 +36673,25 @@ static void library_photo_source_collection_real_items_altered (DataCollection* _alteration_unref0 (alteration); #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (object); -#line 36352 "Photo.c" +#line 36672 "Photo.c" } #line 4662 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_object_it); -#line 36356 "Photo.c" +#line 36676 "Photo.c" } #line 4693 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = items; -#line 4693 "/home/jens/Source/shotwell/src/Photo.vala" - DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp72_); -#line 36362 "Photo.c" + 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), items); +#line 36680 "Photo.c" } -static void library_photo_source_collection_real_postprocess_imported_media (MediaSourceCollection* base, GeeCollection* media_sources) { +static void +library_photo_source_collection_real_postprocess_imported_media (MediaSourceCollection* base, + GeeCollection* media_sources) +{ LibraryPhotoSourceCollection * self; GeeHashMultiMap* map = NULL; GeeHashMultiMap* _tmp0_; - GeeCollection* _tmp97_; #line 4697 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4697 "/home/jens/Source/shotwell/src/Photo.vala" @@ -36380,246 +36700,227 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 4698 "/home/jens/Source/shotwell/src/Photo.vala" map = _tmp0_; -#line 36379 "Photo.c" +#line 36699 "Photo.c" { GeeIterator* _media_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_sources; + GeeIterator* _tmp1_; #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media_sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _media_it = _tmp2_; + _media_it = _tmp1_; #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36392 "Photo.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 36709 "Photo.c" + GeeIterator* _tmp2_; MediaSource* media = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; LibraryPhoto* photo = NULL; - MediaSource* _tmp7_; - LibraryPhoto* _tmp8_; + MediaSource* _tmp5_; + LibraryPhoto* _tmp6_; PhotoMetadata* metadata = NULL; - LibraryPhoto* _tmp9_; - PhotoMetadata* _tmp10_; + LibraryPhoto* _tmp7_; + PhotoMetadata* _tmp8_; HierarchicalTagIndex* global_index = NULL; - HierarchicalTagIndex* _tmp11_; + HierarchicalTagIndex* _tmp9_; HierarchicalTagIndex* htag_index = NULL; - PhotoMetadata* _tmp12_; - gboolean _tmp13_; - LibraryPhoto* _tmp18_; - GeeCollection* _tmp19_; - GeeCollection* _tmp20_; - gboolean _tmp21_; - PhotoMetadata* _tmp55_; - gboolean _tmp56_; -#line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _media_it; + PhotoMetadata* _tmp10_; + LibraryPhoto* _tmp15_; + GeeCollection* _tmp16_; + GeeCollection* _tmp17_; + gboolean _tmp18_; + PhotoMetadata* _tmp49_; #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _media_it; #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36423 "Photo.c" +#line 36735 "Photo.c" } #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _media_it; + _tmp3_ = _media_it; #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" - media = (MediaSource*) _tmp6_; + media = (MediaSource*) _tmp4_; #line 4700 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = media; + _tmp5_ = media; #line 4700 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 4700 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp8_; + photo = _tmp6_; #line 4701 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo; + _tmp7_ = photo; #line 4701 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource)); + _tmp8_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO_SOURCE, PhotoSource)); #line 4701 "/home/jens/Source/shotwell/src/Photo.vala" - metadata = _tmp10_; + metadata = _tmp8_; #line 4704 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = hierarchical_tag_index_get_global_index (); + _tmp9_ = hierarchical_tag_index_get_global_index (); #line 4704 "/home/jens/Source/shotwell/src/Photo.vala" - global_index = _tmp11_; + global_index = _tmp9_; #line 4711 "/home/jens/Source/shotwell/src/Photo.vala" htag_index = NULL; #line 4712 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = metadata; -#line 4712 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_metadata_has_hierarchical_keywords (_tmp12_); + _tmp10_ = metadata; #line 4712 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp13_) { -#line 36455 "Photo.c" - PhotoMetadata* _tmp14_; - GeeSet* _tmp15_; - GeeSet* _tmp16_; - HierarchicalTagIndex* _tmp17_; + if (photo_metadata_has_hierarchical_keywords (_tmp10_)) { +#line 36765 "Photo.c" + PhotoMetadata* _tmp11_; + GeeSet* _tmp12_; + GeeSet* _tmp13_; + HierarchicalTagIndex* _tmp14_; #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = metadata; + _tmp11_ = metadata; #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_metadata_get_hierarchical_keywords (_tmp14_); + _tmp12_ = photo_metadata_get_hierarchical_keywords (_tmp11_); #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp13_ = _tmp12_; #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp14_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (htag_index); #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" - htag_index = _tmp17_; + htag_index = _tmp14_; #line 4713 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp16_); -#line 36474 "Photo.c" + _g_object_unref0 (_tmp13_); +#line 36784 "Photo.c" } #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = photo; + _tmp15_ = photo; #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = library_photo_get_import_keywords (_tmp18_); + _tmp16_ = library_photo_get_import_keywords (_tmp15_); #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp20_ != NULL; + _tmp18_ = _tmp17_ != NULL; #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp17_); #line 4717 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp21_) { -#line 36488 "Photo.c" + if (_tmp18_) { +#line 36798 "Photo.c" { GeeIterator* _keyword_it = NULL; - LibraryPhoto* _tmp22_; - GeeCollection* _tmp23_; - GeeCollection* _tmp24_; - GeeIterator* _tmp25_; - GeeIterator* _tmp26_; + LibraryPhoto* _tmp19_; + GeeCollection* _tmp20_; + GeeCollection* _tmp21_; + GeeIterator* _tmp22_; + GeeIterator* _tmp23_; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = photo; + _tmp19_ = photo; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = library_photo_get_import_keywords (_tmp22_); + _tmp20_ = library_photo_get_import_keywords (_tmp19_); #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _tmp23_; + _tmp21_ = _tmp20_; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp22_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = _tmp25_; + _tmp23_ = _tmp22_; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp21_); #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _keyword_it = _tmp26_; + _keyword_it = _tmp23_; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36512 "Photo.c" - GeeIterator* _tmp27_; - gboolean _tmp28_; +#line 36822 "Photo.c" + GeeIterator* _tmp24_; gchar* keyword = NULL; - GeeIterator* _tmp29_; - gpointer _tmp30_; - gboolean _tmp31_ = FALSE; - HierarchicalTagIndex* _tmp32_; + GeeIterator* _tmp25_; + gpointer _tmp26_; + gboolean _tmp27_ = FALSE; + HierarchicalTagIndex* _tmp28_; gchar* name = NULL; - const gchar* _tmp36_; - gchar* _tmp37_; - HierarchicalTagIndex* _tmp38_; - const gchar* _tmp39_; - gboolean _tmp40_; - const gchar* _tmp49_; -#line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _keyword_it; + const gchar* _tmp31_; + gchar* _tmp32_; + HierarchicalTagIndex* _tmp33_; + const gchar* _tmp34_; + const gchar* _tmp43_; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = gee_iterator_next (_tmp27_); + _tmp24_ = _keyword_it; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp28_) { + if (!gee_iterator_next (_tmp24_)) { #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36535 "Photo.c" +#line 36841 "Photo.c" } #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _keyword_it; + _tmp25_ = _keyword_it; #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = gee_iterator_get (_tmp29_); + _tmp26_ = gee_iterator_get (_tmp25_); #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" - keyword = (gchar*) _tmp30_; + keyword = (gchar*) _tmp26_; #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = htag_index; + _tmp28_ = htag_index; #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp32_ != NULL) { -#line 36547 "Photo.c" - HierarchicalTagIndex* _tmp33_; - const gchar* _tmp34_; - gboolean _tmp35_; -#line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = htag_index; + if (_tmp28_ != NULL) { +#line 36853 "Photo.c" + HierarchicalTagIndex* _tmp29_; + const gchar* _tmp30_; #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = keyword; + _tmp29_ = htag_index; #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = hierarchical_tag_index_is_tag_in_index (_tmp33_, _tmp34_); + _tmp30_ = keyword; #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = _tmp35_; -#line 36559 "Photo.c" + _tmp27_ = hierarchical_tag_index_is_tag_in_index (_tmp29_, _tmp30_); +#line 36862 "Photo.c" } else { #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = FALSE; -#line 36563 "Photo.c" + _tmp27_ = FALSE; +#line 36866 "Photo.c" } #line 4719 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp31_) { + if (_tmp27_) { #line 4720 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); #line 4720 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 36571 "Photo.c" +#line 36874 "Photo.c" } #line 4722 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = keyword; + _tmp31_ = keyword; #line 4722 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = tag_prep_tag_name (_tmp36_); + _tmp32_ = tag_prep_tag_name (_tmp31_); #line 4722 "/home/jens/Source/shotwell/src/Photo.vala" - name = _tmp37_; -#line 4724 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = global_index; + name = _tmp32_; #line 4724 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = name; + _tmp33_ = global_index; #line 4724 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = hierarchical_tag_index_is_tag_in_index (_tmp38_, _tmp39_); + _tmp34_ = name; #line 4724 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp40_) { -#line 36587 "Photo.c" + if (hierarchical_tag_index_is_tag_in_index (_tmp33_, _tmp34_)) { +#line 36888 "Photo.c" gchar* most_derived_path = NULL; - HierarchicalTagIndex* _tmp41_; - const gchar* _tmp42_; - gchar* _tmp43_; - GeeHashMultiMap* _tmp44_; - const gchar* _tmp45_; - Tag* _tmp46_; - Tag* _tmp47_; - LibraryPhoto* _tmp48_; + HierarchicalTagIndex* _tmp35_; + const gchar* _tmp36_; + gchar* _tmp37_; + GeeHashMultiMap* _tmp38_; + const gchar* _tmp39_; + Tag* _tmp40_; + Tag* _tmp41_; + LibraryPhoto* _tmp42_; #line 4725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = global_index; + _tmp35_ = global_index; #line 4725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = name; + _tmp36_ = name; #line 4725 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = hierarchical_tag_index_get_path_for_name (_tmp41_, _tmp42_); + _tmp37_ = hierarchical_tag_index_get_path_for_name (_tmp35_, _tmp36_); #line 4725 "/home/jens/Source/shotwell/src/Photo.vala" - most_derived_path = _tmp43_; + most_derived_path = _tmp37_; #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = map; + _tmp38_ = map; #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = most_derived_path; + _tmp39_ = most_derived_path; #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = tag_for_path (_tmp45_); + _tmp40_ = tag_for_path (_tmp39_); #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _tmp46_; + _tmp41_ = _tmp40_; #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = photo; + _tmp42_ = photo; #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp47_, _tmp48_); + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp41_, _tmp42_); #line 4726 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp47_); + _g_object_unref0 (_tmp41_); #line 4727 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (most_derived_path); #line 4727 "/home/jens/Source/shotwell/src/Photo.vala" @@ -36628,142 +36929,137 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _g_free0 (keyword); #line 4727 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 36627 "Photo.c" +#line 36928 "Photo.c" } #line 4730 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = name; + _tmp43_ = name; #line 4730 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp49_ != NULL) { -#line 36633 "Photo.c" - GeeHashMultiMap* _tmp50_; - const gchar* _tmp51_; - Tag* _tmp52_; - Tag* _tmp53_; - LibraryPhoto* _tmp54_; + if (_tmp43_ != NULL) { +#line 36934 "Photo.c" + GeeHashMultiMap* _tmp44_; + const gchar* _tmp45_; + Tag* _tmp46_; + Tag* _tmp47_; + LibraryPhoto* _tmp48_; #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = map; + _tmp44_ = map; #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = name; + _tmp45_ = name; #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = tag_for_path (_tmp51_); + _tmp46_ = tag_for_path (_tmp45_); #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = _tmp52_; + _tmp47_ = _tmp46_; #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = photo; + _tmp48_ = photo; #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp53_, _tmp54_); + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp47_, _tmp48_); #line 4731 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp53_); -#line 36653 "Photo.c" + _g_object_unref0 (_tmp47_); +#line 36954 "Photo.c" } #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 36659 "Photo.c" +#line 36960 "Photo.c" } #line 4718 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_keyword_it); -#line 36663 "Photo.c" +#line 36964 "Photo.c" } } #line 4735 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = metadata; -#line 4735 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = photo_metadata_has_hierarchical_keywords (_tmp55_); + _tmp49_ = metadata; #line 4735 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp56_) { -#line 36672 "Photo.c" + if (photo_metadata_has_hierarchical_keywords (_tmp49_)) { +#line 36971 "Photo.c" { GeeIterator* _path_it = NULL; - HierarchicalTagIndex* _tmp57_; - GeeCollection* _tmp58_; - GeeCollection* _tmp59_; - GeeIterator* _tmp60_; - GeeIterator* _tmp61_; + HierarchicalTagIndex* _tmp50_; + GeeCollection* _tmp51_; + GeeCollection* _tmp52_; + GeeIterator* _tmp53_; + GeeIterator* _tmp54_; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = htag_index; + _tmp50_ = htag_index; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = hierarchical_tag_index_get_all_paths (_tmp57_); + _tmp51_ = hierarchical_tag_index_get_all_paths (_tmp50_); #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = _tmp58_; + _tmp52_ = _tmp51_; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp53_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = _tmp60_; + _tmp54_ = _tmp53_; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp59_); + _g_object_unref0 (_tmp52_); #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _path_it = _tmp61_; + _path_it = _tmp54_; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36696 "Photo.c" - GeeIterator* _tmp62_; - gboolean _tmp63_; +#line 36995 "Photo.c" + GeeIterator* _tmp55_; gchar* path = NULL; - GeeIterator* _tmp64_; - gpointer _tmp65_; + GeeIterator* _tmp56_; + gpointer _tmp57_; gchar* name = NULL; - const gchar* _tmp66_; - gchar* _tmp67_; - const gchar* _tmp68_; + const gchar* _tmp58_; + gchar* _tmp59_; + const gchar* _tmp60_; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = _path_it; + _tmp55_ = _path_it; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = gee_iterator_next (_tmp62_); -#line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp63_) { + if (!gee_iterator_next (_tmp55_)) { #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36714 "Photo.c" +#line 37010 "Photo.c" } #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = _path_it; + _tmp56_ = _path_it; #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = gee_iterator_get (_tmp64_); + _tmp57_ = gee_iterator_get (_tmp56_); #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" - path = (gchar*) _tmp65_; + path = (gchar*) _tmp57_; #line 4737 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = path; + _tmp58_ = path; #line 4737 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = tag_prep_tag_name (_tmp66_); + _tmp59_ = tag_prep_tag_name (_tmp58_); #line 4737 "/home/jens/Source/shotwell/src/Photo.vala" - name = _tmp67_; + name = _tmp59_; #line 4738 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = name; + _tmp60_ = name; #line 4738 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp68_ != NULL) { -#line 36732 "Photo.c" - GeeHashMultiMap* _tmp69_; - const gchar* _tmp70_; - Tag* _tmp71_; - Tag* _tmp72_; - LibraryPhoto* _tmp73_; + if (_tmp60_ != NULL) { +#line 37028 "Photo.c" + GeeHashMultiMap* _tmp61_; + const gchar* _tmp62_; + Tag* _tmp63_; + Tag* _tmp64_; + LibraryPhoto* _tmp65_; #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = map; + _tmp61_ = map; #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = name; + _tmp62_ = name; #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = tag_for_path (_tmp70_); + _tmp63_ = tag_for_path (_tmp62_); #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = _tmp71_; + _tmp64_ = _tmp63_; #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = photo; + _tmp65_ = photo; #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp72_, _tmp73_); + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp64_, _tmp65_); #line 4739 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp72_); -#line 36752 "Photo.c" + _g_object_unref0 (_tmp64_); +#line 37048 "Photo.c" } #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (name); #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (path); -#line 36758 "Photo.c" +#line 37054 "Photo.c" } #line 4736 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_path_it); -#line 36762 "Photo.c" +#line 37058 "Photo.c" } } #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" @@ -36776,281 +37072,280 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med _g_object_unref0 (photo); #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 36775 "Photo.c" +#line 37071 "Photo.c" } #line 4699 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 36779 "Photo.c" +#line 37075 "Photo.c" } { GeeIterator* _media_it = NULL; - GeeCollection* _tmp74_; - GeeIterator* _tmp75_; -#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = media_sources; + GeeIterator* _tmp66_; #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp66_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media_sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _media_it = _tmp75_; + _media_it = _tmp66_; #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36793 "Photo.c" - GeeIterator* _tmp76_; - gboolean _tmp77_; +#line 37086 "Photo.c" + GeeIterator* _tmp67_; MediaSource* media = NULL; - GeeIterator* _tmp78_; - gpointer _tmp79_; + GeeIterator* _tmp68_; + gpointer _tmp69_; LibraryPhoto* photo = NULL; - MediaSource* _tmp80_; - LibraryPhoto* _tmp81_; - LibraryPhoto* _tmp82_; -#line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = _media_it; + MediaSource* _tmp70_; + LibraryPhoto* _tmp71_; + LibraryPhoto* _tmp72_; #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = gee_iterator_next (_tmp76_); + _tmp67_ = _media_it; #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp77_) { + if (!gee_iterator_next (_tmp67_)) { #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36811 "Photo.c" +#line 37101 "Photo.c" } #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp78_ = _media_it; + _tmp68_ = _media_it; #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = gee_iterator_get (_tmp78_); + _tmp69_ = gee_iterator_get (_tmp68_); #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" - media = (MediaSource*) _tmp79_; + media = (MediaSource*) _tmp69_; #line 4745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp80_ = media; + _tmp70_ = media; #line 4745 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp71_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 4745 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp81_; + photo = _tmp71_; #line 4746 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = photo; + _tmp72_ = photo; #line 4746 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_clear_import_keywords (_tmp82_); + library_photo_clear_import_keywords (_tmp72_); #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 36833 "Photo.c" +#line 37123 "Photo.c" } #line 4744 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 36837 "Photo.c" +#line 37127 "Photo.c" } { GeeIterator* _tag_it = NULL; - GeeHashMultiMap* _tmp83_; - GeeSet* _tmp84_; - GeeSet* _tmp85_; - GeeIterator* _tmp86_; - GeeIterator* _tmp87_; + GeeHashMultiMap* _tmp73_; + GeeSet* _tmp74_; + GeeSet* _tmp75_; + GeeIterator* _tmp76_; + GeeIterator* _tmp77_; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp83_ = map; + _tmp73_ = map; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp84_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); + _tmp74_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp85_ = _tmp84_; + _tmp75_ = _tmp74_; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp86_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp76_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp87_ = _tmp86_; + _tmp77_ = _tmp76_; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp85_); + _g_object_unref0 (_tmp75_); #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tag_it = _tmp87_; + _tag_it = _tmp77_; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 36862 "Photo.c" - GeeIterator* _tmp88_; - gboolean _tmp89_; +#line 37152 "Photo.c" + GeeIterator* _tmp78_; Tag* tag = NULL; - GeeIterator* _tmp90_; - gpointer _tmp91_; - Tag* _tmp92_; - GeeHashMultiMap* _tmp93_; - Tag* _tmp94_; - GeeCollection* _tmp95_; - GeeCollection* _tmp96_; -#line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp88_ = _tag_it; + GeeIterator* _tmp79_; + gpointer _tmp80_; + Tag* _tmp81_; + GeeHashMultiMap* _tmp82_; + Tag* _tmp83_; + GeeCollection* _tmp84_; + GeeCollection* _tmp85_; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp89_ = gee_iterator_next (_tmp88_); + _tmp78_ = _tag_it; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp89_) { + if (!gee_iterator_next (_tmp78_)) { #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 36881 "Photo.c" +#line 37168 "Photo.c" } #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp90_ = _tag_it; + _tmp79_ = _tag_it; #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp91_ = gee_iterator_get (_tmp90_); + _tmp80_ = gee_iterator_get (_tmp79_); #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" - tag = (Tag*) _tmp91_; + tag = (Tag*) _tmp80_; #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp92_ = tag; + _tmp81_ = tag; #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp93_ = map; + _tmp82_ = map; #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp94_ = tag; + _tmp83_ = tag; #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp95_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp94_); + _tmp84_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp83_); #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp96_ = _tmp95_; + _tmp85_ = _tmp84_; #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - tag_attach_many (_tmp92_, _tmp96_); + tag_attach_many (_tmp81_, _tmp85_); #line 4750 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp96_); + _g_object_unref0 (_tmp85_); #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 36905 "Photo.c" +#line 37192 "Photo.c" } #line 4749 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_it); -#line 36909 "Photo.c" +#line 37196 "Photo.c" } #line 4752 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp97_ = media_sources; -#line 4752 "/home/jens/Source/shotwell/src/Photo.vala" - MEDIA_SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->postprocess_imported_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp97_); + MEDIA_SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->postprocess_imported_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), media_sources); #line 4697 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (map); -#line 36917 "Photo.c" +#line 37202 "Photo.c" } -static void library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { - LibraryPhoto* _tmp0_; - PhotoMetadata* _tmp1_; +static void +library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4756 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4756 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 4757 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = metadata; -#line 4757 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 36934 "Photo.c" + g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL], 0, photo, metadata); +#line 37217 "Photo.c" } -void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +void +library_photo_source_collection_notify_master_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4756 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4756 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_master_reimported (self, photo, metadata); -#line 36943 "Photo.c" +#line 37230 "Photo.c" } -static void library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { - LibraryPhoto* _tmp0_; - PhotoMetadata* _tmp1_; +static void +library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4761 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4761 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 4762 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 4762 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = metadata; -#line 4762 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 36960 "Photo.c" + g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL], 0, photo, metadata); +#line 37245 "Photo.c" } -void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +void +library_photo_source_collection_notify_editable_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4761 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4761 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_editable_reimported (self, photo, metadata); -#line 36969 "Photo.c" +#line 37258 "Photo.c" } -static void library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { - LibraryPhoto* _tmp0_; - PhotoMetadata* _tmp1_; +static void +library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4766 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4766 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 4767 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = metadata; -#line 4767 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 36986 "Photo.c" + g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL], 0, photo, metadata); +#line 37273 "Photo.c" } -void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +void +library_photo_source_collection_notify_source_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4766 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4766 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_source_reimported (self, photo, metadata); -#line 36995 "Photo.c" +#line 37286 "Photo.c" } -static void library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { - LibraryPhoto* _tmp0_; - PhotoMetadata* _tmp1_; +static void +library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4771 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4771 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 4772 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 4772 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = metadata; -#line 4772 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 37012 "Photo.c" + g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL], 0, photo, metadata); +#line 37301 "Photo.c" } -void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +void +library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4771 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4771 "/home/jens/Source/shotwell/src/Photo.vala" LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_baseline_reimported (self, photo, metadata); -#line 37021 "Photo.c" +#line 37314 "Photo.c" } -static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, gint64 numeric_id) { +static MediaSource* +library_photo_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, + gint64 numeric_id) +{ LibraryPhotoSourceCollection * self; MediaSource* result = NULL; - gint64 _tmp0_; - PhotoID _tmp1_ = {0}; - LibraryPhoto* _tmp2_; + PhotoID _tmp0_ = {0}; + LibraryPhoto* _tmp1_; #line 4775 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4776 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = numeric_id; -#line 4776 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id_init (&_tmp1_, _tmp0_); + photo_id_init (&_tmp0_, numeric_id); #line 4776 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = library_photo_source_collection_fetch (self, &_tmp1_); + _tmp1_ = library_photo_source_collection_fetch (self, &_tmp0_); #line 4776 "/home/jens/Source/shotwell/src/Photo.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource); #line 4776 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37043 "Photo.c" +#line 37336 "Photo.c" } -static void library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) { - GeeCollection* _tmp0_; - GeeCollection* _tmp1_; +static void +library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 4779 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4779 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37058,19 +37353,17 @@ static void library_photo_source_collection_on_trashcan_contents_altered (Librar #line 4779 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 4781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = added; -#line 4781 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = removed; -#line 4781 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 37062 "Photo.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_COLLECTION, GeeCollection)); +#line 37353 "Photo.c" } -static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryPhotoSourceCollection* self, DataSource* source, Alteration* alteration) { +static gboolean +library_photo_source_collection_check_if_trashed_photo (LibraryPhotoSourceCollection* self, + DataSource* source, + Alteration* alteration) +{ gboolean result = FALSE; - DataSource* _tmp0_; - gboolean _tmp1_; #line 4785 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 4785 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37078,20 +37371,18 @@ static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryP #line 4785 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 4786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = source; -#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); -#line 4786 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp1_; + result = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); #line 4786 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37084 "Photo.c" +#line 37373 "Photo.c" } -static void library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) { - GeeCollection* _tmp0_; - GeeCollection* _tmp1_; +static void +library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 4789 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4789 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37099,19 +37390,17 @@ static void library_photo_source_collection_on_offline_contents_altered (Library #line 4789 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 4791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = added; -#line 4791 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = removed; -#line 4791 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 37103 "Photo.c" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_COLLECTION, GeeCollection)); +#line 37390 "Photo.c" } -static gboolean library_photo_source_collection_check_if_offline_photo (LibraryPhotoSourceCollection* self, DataSource* source, Alteration* alteration) { +static gboolean +library_photo_source_collection_check_if_offline_photo (LibraryPhotoSourceCollection* self, + DataSource* source, + Alteration* alteration) +{ gboolean result = FALSE; - DataSource* _tmp0_; - gboolean _tmp1_; #line 4795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 4795 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37119,232 +37408,169 @@ static gboolean library_photo_source_collection_check_if_offline_photo (LibraryP #line 4795 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 4796 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = source; -#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); -#line 4796 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp1_; + result = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource)); #line 4796 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37125 "Photo.c" +#line 37410 "Photo.c" } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 37148 "Photo.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 37156 "Photo.c" +#line 37434 "Photo.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 37168 "Photo.c" +#line 37443 "Photo.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 37192 "Photo.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 37198 "Photo.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 37464 "Photo.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 37202 "Photo.c" +#line 37468 "Photo.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 37206 "Photo.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 37474 "Photo.c" + } else { + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 37484 "Photo.c" + } +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 37488 "Photo.c" glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 37496 "Photo.c" + } else { glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 37503 "Photo.c" + } +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 37507 "Photo.c" glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 37218 "Photo.c" - } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 37228 "Photo.c" - } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 37234 "Photo.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 37248 "Photo.c" - } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 37258 "Photo.c" - } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 37264 "Photo.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 37273 "Photo.c" - } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 37513 "Photo.c" + } +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 37293 "Photo.c" +#line 37525 "Photo.c" } -static MediaSource* library_photo_source_collection_real_fetch_by_source_id (MediaSourceCollection* base, const gchar* source_id) { +static MediaSource* +library_photo_source_collection_real_fetch_by_source_id (MediaSourceCollection* base, + const gchar* source_id) +{ LibraryPhotoSourceCollection * self; MediaSource* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; gchar* numeric_only = NULL; - const gchar* _tmp2_; - gint _tmp3_; - gint _tmp4_; - gchar* _tmp5_; - gint64 _tmp6_; - MediaSource* _tmp7_; + gint _tmp0_; + gint _tmp1_; + gchar* _tmp2_; + MediaSource* _tmp3_; #line 4799 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4799 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (source_id != NULL, NULL); #line 4800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = source_id; -#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME); -#line 4800 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp1_, "source_id.has_prefix(Photo.TYPENAME)"); + _vala_assert (g_str_has_prefix (source_id, PHOTO_TYPENAME), "source_id.has_prefix(Photo.TYPENAME)"); #line 4801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = source_id; + _tmp0_ = strlen (PHOTO_TYPENAME); #line 4801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = strlen (PHOTO_TYPENAME); -#line 4801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp1_ = _tmp0_; #line 4801 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = string_substring (_tmp2_, (glong) _tmp4_, (glong) -1); + _tmp2_ = string_substring (source_id, (glong) _tmp1_, (glong) -1); #line 4801 "/home/jens/Source/shotwell/src/Photo.vala" - numeric_only = _tmp5_; -#line 4803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = parse_int64 (numeric_only, 16); + numeric_only = _tmp2_; #line 4803 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = media_source_collection_fetch_by_numeric_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp6_); + _tmp3_ = media_source_collection_fetch_by_numeric_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), parse_int64 (numeric_only, 16)); #line 4803 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp7_; + result = _tmp3_; #line 4803 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (numeric_only); #line 4803 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37339 "Photo.c" +#line 37562 "Photo.c" } -static GeeCollection* library_photo_source_collection_real_get_event_source_ids (MediaSourceCollection* base, EventID* event_id) { +static GeeCollection* +library_photo_source_collection_real_get_event_source_ids (MediaSourceCollection* base, + EventID* event_id) +{ LibraryPhotoSourceCollection * self; GeeCollection* result = NULL; PhotoTable* _tmp0_; @@ -37372,11 +37598,14 @@ static GeeCollection* library_photo_source_collection_real_get_event_source_ids result = _tmp4_; #line 4807 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37371 "Photo.c" +#line 37597 "Photo.c" } -LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id) { +LibraryPhoto* +library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, + PhotoID* photo_id) +{ LibraryPhoto* result = NULL; PhotoID _tmp0_; gint64 _tmp1_; @@ -37395,15 +37624,17 @@ LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollectio result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4811 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37394 "Photo.c" +#line 37623 "Photo.c" } -LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPhotoSourceCollection* self, GFile* file) { +LibraryPhoto* +library_photo_source_collection_fetch_by_editable_file (LibraryPhotoSourceCollection* self, + GFile* file) +{ LibraryPhoto* result = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 4814 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); #line 4814 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37411,22 +37642,22 @@ LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPho #line 4815 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->by_editable_file; #line 4815 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file; -#line 4815 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 4815 "/home/jens/Source/shotwell/src/Photo.vala" - result = (LibraryPhoto*) _tmp2_; + result = (LibraryPhoto*) _tmp1_; #line 4815 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37417 "Photo.c" +#line 37646 "Photo.c" } -LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (LibraryPhotoSourceCollection* self, GFile* file) { +LibraryPhoto* +library_photo_source_collection_fetch_by_raw_development_file (LibraryPhotoSourceCollection* self, + GFile* file) +{ LibraryPhoto* result = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 4818 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); #line 4818 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37434,33 +37665,33 @@ LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (Lib #line 4819 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->by_raw_development_file; #line 4819 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file; -#line 4819 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 4819 "/home/jens/Source/shotwell/src/Photo.vala" - result = (LibraryPhoto*) _tmp2_; + result = (LibraryPhoto*) _tmp1_; #line 4819 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37440 "Photo.c" +#line 37669 "Photo.c" } -static void library_photo_source_collection_compare_backing (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matches_development) { - LibraryPhoto* _tmp0_; +static void +library_photo_source_collection_compare_backing (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + GFileInfo* info, + GeeCollection* matches_master, + GeeCollection* matches_editable, + GeeCollection* matches_development) +{ + BackingPhotoRow* _tmp0_; BackingPhotoRow* _tmp1_; - BackingPhotoRow* _tmp2_; - GFileInfo* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; + gboolean _tmp2_; BackingPhotoRow* editable = NULL; - LibraryPhoto* _tmp8_; - BackingPhotoRow* _tmp9_; - gboolean _tmp10_ = FALSE; - BackingPhotoRow* _tmp11_; + BackingPhotoRow* _tmp3_; + gboolean _tmp4_ = FALSE; + BackingPhotoRow* _tmp5_; GeeCollection* development = NULL; - LibraryPhoto* _tmp17_; - GeeCollection* _tmp18_; - GeeCollection* _tmp19_; + GeeCollection* _tmp7_; + GeeCollection* _tmp8_; #line 4822 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4822 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37474,162 +37705,122 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC #line 4822 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matches_development)); #line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo; -#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo)); -#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = _tmp1_; + _tmp0_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = info; + _tmp1_ = _tmp0_; #line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = backing_photo_row_matches_file_info (_tmp2_, _tmp3_); + _tmp2_ = backing_photo_row_matches_file_info (_tmp1_, info); #line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _backing_photo_row_unref0 (_tmp1_); #line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - _backing_photo_row_unref0 (_tmp2_); -#line 4825 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 37488 "Photo.c" - GeeCollection* _tmp6_; - LibraryPhoto* _tmp7_; -#line 4826 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = matches_master; -#line 4826 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo; + if (_tmp2_) { #line 4826 "/home/jens/Source/shotwell/src/Photo.vala" - gee_collection_add (_tmp6_, _tmp7_); -#line 37497 "Photo.c" + gee_collection_add (matches_master, photo); +#line 37715 "Photo.c" } #line 4828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo; -#line 4828 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo)); + _tmp3_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 4828 "/home/jens/Source/shotwell/src/Photo.vala" - editable = _tmp9_; -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = editable; -#line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_ != NULL) { -#line 37509 "Photo.c" - BackingPhotoRow* _tmp12_; - GFileInfo* _tmp13_; - gboolean _tmp14_; + editable = _tmp3_; #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = editable; + _tmp5_ = editable; #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = info; + if (_tmp5_ != NULL) { +#line 37725 "Photo.c" + BackingPhotoRow* _tmp6_; #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = backing_photo_row_matches_file_info (_tmp12_, _tmp13_); + _tmp6_ = editable; #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp14_; -#line 37521 "Photo.c" + _tmp4_ = backing_photo_row_matches_file_info (_tmp6_, info); +#line 37731 "Photo.c" } else { #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = FALSE; -#line 37525 "Photo.c" + _tmp4_ = FALSE; +#line 37735 "Photo.c" } #line 4829 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp10_) { -#line 37529 "Photo.c" - GeeCollection* _tmp15_; - LibraryPhoto* _tmp16_; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = matches_editable; -#line 4830 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo; + if (_tmp4_) { #line 4830 "/home/jens/Source/shotwell/src/Photo.vala" - gee_collection_add (_tmp15_, _tmp16_); -#line 37538 "Photo.c" + gee_collection_add (matches_editable, photo); +#line 37741 "Photo.c" } #line 4832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo; -#line 4832 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo)); + _tmp7_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 4832 "/home/jens/Source/shotwell/src/Photo.vala" - development = _tmp18_; + development = _tmp7_; #line 4833 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = development; + _tmp8_ = development; #line 4833 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp19_ != NULL) { -#line 37550 "Photo.c" + if (_tmp8_ != NULL) { +#line 37751 "Photo.c" { GeeIterator* _row_it = NULL; - GeeCollection* _tmp20_; - GeeIterator* _tmp21_; + GeeCollection* _tmp9_; + GeeIterator* _tmp10_; #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = development; + _tmp9_ = development; #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _row_it = _tmp21_; + _row_it = _tmp10_; #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37563 "Photo.c" - GeeIterator* _tmp22_; - gboolean _tmp23_; +#line 37764 "Photo.c" + GeeIterator* _tmp11_; BackingPhotoRow* row = NULL; - GeeIterator* _tmp24_; - gpointer _tmp25_; - BackingPhotoRow* _tmp26_; - GFileInfo* _tmp27_; - gboolean _tmp28_; -#line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _row_it; + GeeIterator* _tmp12_; + gpointer _tmp13_; + BackingPhotoRow* _tmp14_; #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = gee_iterator_next (_tmp22_); + _tmp11_ = _row_it; #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp23_) { + if (!gee_iterator_next (_tmp11_)) { #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37580 "Photo.c" +#line 37776 "Photo.c" } #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = _row_it; + _tmp12_ = _row_it; #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = gee_iterator_get (_tmp24_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" - row = (BackingPhotoRow*) _tmp25_; -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = row; -#line 4835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = info; + row = (BackingPhotoRow*) _tmp13_; #line 4835 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = backing_photo_row_matches_file_info (_tmp26_, _tmp27_); + _tmp14_ = row; #line 4835 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp28_) { -#line 37596 "Photo.c" - GeeCollection* _tmp29_; - LibraryPhoto* _tmp30_; -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = matches_development; -#line 4836 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = photo; + if (backing_photo_row_matches_file_info (_tmp14_, info)) { #line 4836 "/home/jens/Source/shotwell/src/Photo.vala" - gee_collection_add (_tmp29_, _tmp30_); + gee_collection_add (matches_development, photo); #line 4838 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); #line 4838 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37609 "Photo.c" +#line 37794 "Photo.c" } #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (row); -#line 37613 "Photo.c" +#line 37798 "Photo.c" } #line 4834 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_row_it); -#line 37617 "Photo.c" +#line 37802 "Photo.c" } } #line 4822 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (development); #line 4822 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (editable); -#line 37624 "Photo.c" +#line 37809 "Photo.c" } -void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matched_development) { +void +library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, + GFileInfo* info, + GeeCollection* matches_master, + GeeCollection* matches_editable, + GeeCollection* matched_development) +{ #line 4846 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4846 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37640,303 +37831,260 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour g_return_if_fail (GEE_IS_COLLECTION (matches_editable)); #line 4846 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (GEE_IS_COLLECTION (matched_development)); -#line 37639 "Photo.c" +#line 37830 "Photo.c" { GeeIterator* _photo_it = NULL; GeeMultiMap* _tmp0_; - GFileInfo* _tmp1_; - gint64 _tmp2_; + gint64 _tmp1_; + GeeCollection* _tmp2_; GeeCollection* _tmp3_; - GeeCollection* _tmp4_; + GeeIterator* _tmp4_; GeeIterator* _tmp5_; - GeeIterator* _tmp6_; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->filesize_to_photo; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = info; + _tmp1_ = g_file_info_get_size (info); #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = g_file_info_get_size (_tmp1_); -#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_multi_map_get (_tmp0_, &_tmp2_); + _tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_); #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_it = _tmp6_; + _photo_it = _tmp5_; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37669 "Photo.c" - GeeIterator* _tmp7_; - gboolean _tmp8_; +#line 37857 "Photo.c" + GeeIterator* _tmp6_; LibraryPhoto* photo = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - LibraryPhoto* _tmp11_; - GFileInfo* _tmp12_; - GeeCollection* _tmp13_; - GeeCollection* _tmp14_; - GeeCollection* _tmp15_; -#line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _photo_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + LibraryPhoto* _tmp9_; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = gee_iterator_next (_tmp7_); + _tmp6_ = _photo_it; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp6_)) { #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37688 "Photo.c" +#line 37869 "Photo.c" } #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _photo_it; + _tmp7_ = _photo_it; #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" - photo = (LibraryPhoto*) _tmp10_; -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = photo; + photo = (LibraryPhoto*) _tmp8_; #line 4849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = info; -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = matches_master; -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = matches_editable; -#line 4849 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = matched_development; + _tmp9_ = photo; #line 4849 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_compare_backing (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_); + library_photo_source_collection_compare_backing (self, _tmp9_, info, matches_master, matches_editable, matched_development); #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 37710 "Photo.c" +#line 37883 "Photo.c" } #line 4848 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 37714 "Photo.c" +#line 37887 "Photo.c" } { GeeIterator* _media_it = NULL; - GeeCollection* _tmp16_; - GeeCollection* _tmp17_; - GeeIterator* _tmp18_; - GeeIterator* _tmp19_; + GeeCollection* _tmp10_; + GeeCollection* _tmp11_; + GeeIterator* _tmp12_; + GeeIterator* _tmp13_; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp10_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_; + _tmp13_ = _tmp12_; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp11_); #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _media_it = _tmp19_; + _media_it = _tmp13_; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37736 "Photo.c" - GeeIterator* _tmp20_; - gboolean _tmp21_; +#line 37909 "Photo.c" + GeeIterator* _tmp14_; MediaSource* media = NULL; - GeeIterator* _tmp22_; - gpointer _tmp23_; - MediaSource* _tmp24_; - GFileInfo* _tmp25_; - GeeCollection* _tmp26_; - GeeCollection* _tmp27_; - GeeCollection* _tmp28_; -#line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _media_it; + GeeIterator* _tmp15_; + gpointer _tmp16_; + MediaSource* _tmp17_; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = gee_iterator_next (_tmp20_); + _tmp14_ = _media_it; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp21_) { + if (!gee_iterator_next (_tmp14_)) { #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37755 "Photo.c" +#line 37921 "Photo.c" } #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _media_it; + _tmp15_ = _media_it; #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = gee_iterator_get (_tmp22_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" - media = (MediaSource*) _tmp23_; -#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = media; -#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = info; -#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = matches_master; + media = (MediaSource*) _tmp16_; #line 4852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = matches_editable; + _tmp17_ = media; #line 4852 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = matched_development; -#line 4852 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_LIBRARY_PHOTO, LibraryPhoto), _tmp25_, _tmp26_, _tmp27_, _tmp28_); + library_photo_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_LIBRARY_PHOTO, LibraryPhoto), info, matches_master, matches_editable, matched_development); #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (media); -#line 37777 "Photo.c" +#line 37935 "Photo.c" } #line 4851 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_media_it); -#line 37781 "Photo.c" +#line 37939 "Photo.c" } } -void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize, PhotoID* result) { - PhotoID _tmp19_ = {0}; +void +library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, + const gchar* basename, + gint64 filesize, + PhotoID* result) +{ + PhotoID _tmp15_ = {0}; #line 4855 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self)); #line 4855 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (basename != NULL); -#line 37792 "Photo.c" +#line 37955 "Photo.c" { GeeIterator* _photo_it = NULL; GeeMultiMap* _tmp0_; - gint64 _tmp1_; + GeeCollection* _tmp1_; GeeCollection* _tmp2_; - GeeCollection* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->filesize_to_photo; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = filesize; + _tmp1_ = gee_multi_map_get (_tmp0_, &filesize); #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_); + _tmp2_ = _tmp1_; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = _tmp3_; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _g_object_unref0 (_tmp2_); #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp3_); -#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _photo_it = _tmp5_; + _photo_it = _tmp4_; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 37819 "Photo.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 37979 "Photo.c" + GeeIterator* _tmp5_; LibraryPhoto* photo = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - LibraryPhoto* _tmp10_; - GFile* _tmp11_; - GFile* _tmp12_; - gchar* _tmp13_; - const gchar* _tmp14_; - gint _tmp15_; - gboolean _tmp16_; -#line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _photo_it; + GeeIterator* _tmp6_; + gpointer _tmp7_; + LibraryPhoto* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; + gchar* _tmp11_; + gboolean _tmp12_; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _photo_it; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 37840 "Photo.c" +#line 37995 "Photo.c" } #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _photo_it; + _tmp6_ = _photo_it; #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" - photo = (LibraryPhoto*) _tmp9_; -#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo; + photo = (LibraryPhoto*) _tmp7_; #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_; + _tmp8_ = photo; #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = g_file_get_basename (_tmp12_); + _tmp9_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource)); #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = basename; + _tmp10_ = _tmp9_; #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_); + _tmp11_ = g_file_get_basename (_tmp10_); #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_ == 0; + _tmp12_ = utf8_ci_compare (_tmp11_, basename) == 0; #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp10_); #line 4857 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp16_) { -#line 37866 "Photo.c" - LibraryPhoto* _tmp17_; - PhotoID _tmp18_ = {0}; + if (_tmp12_) { +#line 38017 "Photo.c" + LibraryPhoto* _tmp13_; + PhotoID _tmp14_ = {0}; #line 4858 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo; + _tmp13_ = photo; #line 4858 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo), &_tmp18_); + photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo), &_tmp14_); #line 4858 "/home/jens/Source/shotwell/src/Photo.vala" - *result = _tmp18_; + *result = _tmp14_; #line 4858 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4858 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); #line 4858 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 37881 "Photo.c" +#line 38032 "Photo.c" } #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 37885 "Photo.c" +#line 38036 "Photo.c" } #line 4856 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_photo_it); -#line 37889 "Photo.c" +#line 38040 "Photo.c" } #line 4861 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id_init (&_tmp19_, PHOTO_ID_INVALID); + photo_id_init (&_tmp15_, PHOTO_ID_INVALID); #line 4861 "/home/jens/Source/shotwell/src/Photo.vala" - *result = _tmp19_; + *result = _tmp15_; #line 4861 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 37897 "Photo.c" +#line 38048 "Photo.c" } -gboolean library_photo_source_collection_has_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize) { +gboolean +library_photo_source_collection_has_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, + const gchar* basename, + gint64 filesize) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gint64 _tmp1_; - PhotoID _tmp2_ = {0}; - gboolean _tmp3_; + PhotoID _tmp0_ = {0}; #line 4865 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 4865 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (basename != NULL, FALSE); #line 4866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = basename; -#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = filesize; + library_photo_source_collection_get_basename_filesize_duplicate (self, basename, filesize, &_tmp0_); #line 4866 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_); -#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_id_is_valid (&_tmp2_); -#line 4866 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; + result = photo_id_is_valid (&_tmp0_); #line 4866 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37923 "Photo.c" +#line 38069 "Photo.c" } -LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self, GFile* file) { +LibraryPhoto* +library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self, + GFile* file) +{ LibraryPhoto* result = NULL; LibraryPhoto* photo = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; - GFile* _tmp2_; - MediaSource* _tmp3_; + MediaSource* _tmp2_; + LibraryPhoto* _tmp3_; LibraryPhoto* _tmp4_; - LibraryPhoto* _tmp5_; #line 4869 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); #line 4869 "/home/jens/Source/shotwell/src/Photo.vala" @@ -37946,55 +38094,52 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS #line 4870 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 4870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = file; + _tmp2_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, file); #line 4870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_); -#line 4870 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4870 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); #line 4870 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp4_; + photo = _tmp3_; #line 4871 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo; + _tmp4_ = photo; #line 4871 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_ == NULL) { -#line 37958 "Photo.c" - MediaSourceHoldingTank* _tmp6_; - LibraryPhotoSourceHoldingTank* _tmp7_; - GFile* _tmp8_; - LibraryPhoto* _tmp9_; -#line 4872 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + if (_tmp4_ == NULL) { +#line 38104 "Photo.c" + MediaSourceHoldingTank* _tmp5_; + LibraryPhotoSourceHoldingTank* _tmp6_; + LibraryPhoto* _tmp7_; #line 4872 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); + _tmp5_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 4872 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = file; + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); #line 4872 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_); + _tmp7_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp6_, file); #line 4872 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4872 "/home/jens/Source/shotwell/src/Photo.vala" - photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4872 "/home/jens/Source/shotwell/src/Photo.vala" - _source_holding_tank_unref0 (_tmp7_); -#line 37977 "Photo.c" + _source_holding_tank_unref0 (_tmp6_); +#line 38120 "Photo.c" } #line 4875 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; #line 4875 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 37983 "Photo.c" +#line 38126 "Photo.c" } -LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5) { +LibraryPhoto* +library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self, + const gchar* md5) +{ LibraryPhoto* result = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; - const gchar* _tmp2_; - MediaSource* _tmp3_; - LibraryPhoto* _tmp4_; + MediaSource* _tmp2_; + LibraryPhoto* _tmp3_; #line 4878 "/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" @@ -38004,30 +38149,30 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSo #line 4879 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 4879 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = md5; -#line 4879 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_); + _tmp2_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, md5); #line 4879 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4879 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); #line 4879 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 4879 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38014 "Photo.c" +#line 38157 "Photo.c" } -LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self, GFile* file) { +LibraryPhoto* +library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self, + GFile* file) +{ LibraryPhoto* result = NULL; LibraryPhoto* photo = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; - GFile* _tmp2_; - MediaSource* _tmp3_; + MediaSource* _tmp2_; + LibraryPhoto* _tmp3_; LibraryPhoto* _tmp4_; - LibraryPhoto* _tmp5_; #line 4882 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); #line 4882 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38037,55 +38182,52 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS #line 4883 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 4883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = file; -#line 4883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_); + _tmp2_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, file); #line 4883 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4883 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); #line 4883 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp4_; + photo = _tmp3_; #line 4884 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo; + _tmp4_ = photo; #line 4884 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_ == NULL) { -#line 38049 "Photo.c" - MediaSourceHoldingTank* _tmp6_; - LibraryPhotoSourceHoldingTank* _tmp7_; - GFile* _tmp8_; - LibraryPhoto* _tmp9_; -#line 4885 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + if (_tmp4_ == NULL) { +#line 38192 "Photo.c" + MediaSourceHoldingTank* _tmp5_; + LibraryPhotoSourceHoldingTank* _tmp6_; + LibraryPhoto* _tmp7_; #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); + _tmp5_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = file; + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_); + _tmp7_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp6_, file); #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" - photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4885 "/home/jens/Source/shotwell/src/Photo.vala" - _source_holding_tank_unref0 (_tmp7_); -#line 38068 "Photo.c" + _source_holding_tank_unref0 (_tmp6_); +#line 38208 "Photo.c" } #line 4888 "/home/jens/Source/shotwell/src/Photo.vala" result = photo; #line 4888 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38074 "Photo.c" +#line 38214 "Photo.c" } -LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5) { +LibraryPhoto* +library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self, + const gchar* md5) +{ LibraryPhoto* result = NULL; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; - const gchar* _tmp2_; - MediaSource* _tmp3_; - LibraryPhoto* _tmp4_; + MediaSource* _tmp2_; + LibraryPhoto* _tmp3_; #line 4891 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); #line 4891 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38095,27 +38237,26 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSo #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = md5; + _tmp2_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, md5); #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_); -#line 4892 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp4_; + result = _tmp3_; #line 4892 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38105 "Photo.c" +#line 38245 "Photo.c" } -gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollection* self) { +gint +library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollection* self) +{ gint result = 0; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; gint _tmp2_; - gint _tmp3_; #line 4895 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), 0); #line 4896 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38125,52 +38266,47 @@ gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollec #line 4896 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = source_holding_tank_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank)); #line 4896 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; -#line 4896 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); #line 4896 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; + result = _tmp2_; #line 4896 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38131 "Photo.c" +#line 38270 "Photo.c" } -LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, GFile* file, LibraryPhotoSourceCollectionState* state) { +LibraryPhoto* +library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, + GFile* file, + LibraryPhotoSourceCollectionState* state) +{ LibraryPhotoSourceCollectionState _vala_state = 0; LibraryPhoto* result = NULL; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - MediaSource* _tmp1_; + MediaSource* _tmp0_; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - GFile* _tmp3_; + LibraryPhoto* _tmp3_; LibraryPhoto* _tmp4_; LibraryPhoto* _tmp5_; - GFile* _tmp6_; + LibraryPhoto* _tmp6_; LibraryPhoto* _tmp7_; LibraryPhoto* _tmp8_; - GFile* _tmp9_; + LibraryPhoto* _tmp9_; LibraryPhoto* _tmp10_; LibraryPhoto* _tmp11_; - LibraryPhoto* _tmp12_; - GFile* _tmp13_; - LibraryPhoto* _tmp14_; - LibraryPhoto* _tmp15_; - LibraryPhoto* _tmp16_; #line 4899 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL); #line 4899 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 4900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; + _tmp0_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), file); #line 4900 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp0_); -#line 4900 "/home/jens/Source/shotwell/src/Photo.vala" - photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto); + photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 4901 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo; + _tmp1_ = photo; #line 4901 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp2_ != NULL) { + if (_tmp1_ != NULL) { #line 4902 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE; #line 4904 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38179,24 +38315,22 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4904 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38178 "Photo.c" +#line 38314 "Photo.c" } #line 4904 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38182 "Photo.c" +#line 38318 "Photo.c" } #line 4907 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = file; -#line 4907 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = library_photo_source_collection_fetch_by_editable_file (self, _tmp3_); + _tmp2_ = library_photo_source_collection_fetch_by_editable_file (self, file); #line 4907 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4907 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp4_; + photo = _tmp2_; #line 4908 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo; + _tmp3_ = photo; #line 4908 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_ != NULL) { + if (_tmp3_ != NULL) { #line 4909 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE; #line 4911 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38205,24 +38339,22 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4911 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38204 "Photo.c" +#line 38338 "Photo.c" } #line 4911 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38208 "Photo.c" +#line 38342 "Photo.c" } #line 4914 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = file; -#line 4914 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = library_photo_source_collection_fetch_by_raw_development_file (self, _tmp6_); + _tmp4_ = library_photo_source_collection_fetch_by_raw_development_file (self, file); #line 4914 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4914 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp7_; + photo = _tmp4_; #line 4915 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = photo; + _tmp5_ = photo; #line 4915 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_ != NULL) { + if (_tmp5_ != NULL) { #line 4916 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER; #line 4918 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38231,32 +38363,30 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4918 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38230 "Photo.c" +#line 38362 "Photo.c" } #line 4918 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38234 "Photo.c" +#line 38366 "Photo.c" } #line 4921 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = file; + _tmp6_ = library_photo_source_collection_get_trashed_by_file (self, file); #line 4921 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = library_photo_source_collection_get_trashed_by_file (self, _tmp9_); + _tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp6_) : NULL; #line 4921 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp10_) : NULL; -#line 4921 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_ == NULL) { + if (_tmp7_ == NULL) { #line 4921 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp10_); -#line 38246 "Photo.c" + _g_object_unref0 (_tmp6_); +#line 38376 "Photo.c" } #line 4921 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4921 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp11_; + photo = _tmp7_; #line 4922 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo; + _tmp8_ = photo; #line 4922 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_ != NULL) { + if (_tmp8_ != NULL) { #line 4923 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH; #line 4925 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38265,32 +38395,30 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4925 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38264 "Photo.c" +#line 38394 "Photo.c" } #line 4925 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38268 "Photo.c" +#line 38398 "Photo.c" } #line 4928 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = file; + _tmp9_ = library_photo_source_collection_get_offline_by_file (self, file); #line 4928 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = library_photo_source_collection_get_offline_by_file (self, _tmp13_); + _tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp9_) : NULL; #line 4928 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp14_) : NULL; -#line 4928 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_ == NULL) { + if (_tmp10_ == NULL) { #line 4928 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp14_); -#line 38280 "Photo.c" + _g_object_unref0 (_tmp9_); +#line 38408 "Photo.c" } #line 4928 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 4928 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp15_; + photo = _tmp10_; #line 4929 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo; + _tmp11_ = photo; #line 4929 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp16_ != NULL) { + if (_tmp11_ != NULL) { #line 4930 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE; #line 4932 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38299,11 +38427,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4932 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38298 "Photo.c" +#line 38426 "Photo.c" } #line 4932 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38302 "Photo.c" +#line 38430 "Photo.c" } #line 4935 "/home/jens/Source/shotwell/src/Photo.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN; @@ -38315,102 +38443,87 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou if (state) { #line 4937 "/home/jens/Source/shotwell/src/Photo.vala" *state = _vala_state; -#line 38314 "Photo.c" +#line 38442 "Photo.c" } #line 4937 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38318 "Photo.c" +#line 38446 "Photo.c" } -static gboolean library_photo_source_collection_real_has_backlink (SourceCollection* base, SourceBacklink* backlink) { +static gboolean +library_photo_source_collection_real_has_backlink (SourceCollection* base, + SourceBacklink* backlink) +{ LibraryPhotoSourceCollection * self; gboolean result = FALSE; - SourceBacklink* _tmp0_; - gboolean _tmp1_; - MediaSourceHoldingTank* _tmp2_; + MediaSourceHoldingTank* _tmp0_; + MediaSourceHoldingTank* _tmp1_; + gboolean _tmp2_; MediaSourceHoldingTank* _tmp3_; - SourceBacklink* _tmp4_; + MediaSourceHoldingTank* _tmp4_; gboolean _tmp5_; - gboolean _tmp6_; - MediaSourceHoldingTank* _tmp7_; - MediaSourceHoldingTank* _tmp8_; - SourceBacklink* _tmp9_; - gboolean _tmp10_; - gboolean _tmp11_; #line 4940 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4940 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (backlink), FALSE); #line 4941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = backlink; -#line 4941 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->has_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp0_); -#line 4941 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { + if (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), backlink)) { #line 4942 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 4942 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38351 "Photo.c" +#line 38472 "Photo.c" } #line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; -#line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = backlink; + _tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp4_); + _tmp1_ = _tmp0_; #line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_; + _tmp2_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), backlink); #line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - _source_holding_tank_unref0 (_tmp3_); + _source_holding_tank_unref0 (_tmp1_); #line 4944 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { + if (_tmp2_) { #line 4945 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 4945 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38371 "Photo.c" +#line 38488 "Photo.c" } #line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_; -#line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = backlink; + _tmp3_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp9_); + _tmp4_ = _tmp3_; #line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_; + _tmp5_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), backlink); #line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - _source_holding_tank_unref0 (_tmp8_); + _source_holding_tank_unref0 (_tmp4_); #line 4947 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_) { + if (_tmp5_) { #line 4948 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 4948 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38391 "Photo.c" +#line 38504 "Photo.c" } #line 4950 "/home/jens/Source/shotwell/src/Photo.vala" result = FALSE; #line 4950 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38397 "Photo.c" +#line 38510 "Photo.c" } -static void library_photo_source_collection_real_remove_backlink (SourceCollection* base, SourceBacklink* backlink) { +static void +library_photo_source_collection_real_remove_backlink (SourceCollection* base, + SourceBacklink* backlink) +{ LibraryPhotoSourceCollection * self; MediaSourceHoldingTank* _tmp0_; MediaSourceHoldingTank* _tmp1_; - SourceBacklink* _tmp2_; + MediaSourceHoldingTank* _tmp2_; MediaSourceHoldingTank* _tmp3_; - MediaSourceHoldingTank* _tmp4_; - SourceBacklink* _tmp5_; - SourceBacklink* _tmp6_; #line 4953 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); #line 4953 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38420,30 +38533,26 @@ static void library_photo_source_collection_real_remove_backlink (SourceCollecti #line 4954 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 4954 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = backlink; -#line 4954 "/home/jens/Source/shotwell/src/Photo.vala" - source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_); + source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), backlink); #line 4954 "/home/jens/Source/shotwell/src/Photo.vala" _source_holding_tank_unref0 (_tmp1_); #line 4955 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 4955 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp2_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 4955 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = backlink; + _tmp3_ = _tmp2_; #line 4955 "/home/jens/Source/shotwell/src/Photo.vala" - source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp5_); + source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), backlink); #line 4955 "/home/jens/Source/shotwell/src/Photo.vala" - _source_holding_tank_unref0 (_tmp4_); -#line 4957 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = backlink; + _source_holding_tank_unref0 (_tmp3_); #line 4957 "/home/jens/Source/shotwell/src/Photo.vala" - SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_); -#line 38438 "Photo.c" + 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), backlink); +#line 38545 "Photo.c" } -static TransactionController* library_photo_source_collection_real_get_transaction_controller (MediaSourceCollection* base) { +static TransactionController* +library_photo_source_collection_real_get_transaction_controller (MediaSourceCollection* base) +{ TransactionController* result; LibraryPhotoSourceCollection* self; TransactionController* _tmp0_; @@ -38454,7 +38563,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti _tmp0_ = self->priv->_transaction_controller; #line 4475 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_ == NULL) { -#line 38453 "Photo.c" +#line 38562 "Photo.c" MediaSourceTransactionController* _tmp1_; #line 4476 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); @@ -38462,7 +38571,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti _transaction_controller_unref0 (self->priv->_transaction_controller); #line 4476 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController); -#line 38461 "Photo.c" +#line 38570 "Photo.c" } #line 4478 "/home/jens/Source/shotwell/src/Photo.vala" _tmp2_ = self->priv->_transaction_controller; @@ -38470,20 +38579,31 @@ static TransactionController* library_photo_source_collection_real_get_transacti result = _tmp2_; #line 4478 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 38469 "Photo.c" +#line 38578 "Photo.c" } -static void library_photo_source_collection_real_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +static void +library_photo_source_collection_real_master_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4496 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4496 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38478 "Photo.c" +#line 38591 "Photo.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__OBJECT_MEDIA_METADATA) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_MEDIA_METADATA callback; register GCClosure * cc; @@ -38498,50 +38618,64 @@ static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * clos data1 = closure->data; #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" data2 = param_values->data[0].v_pointer; -#line 38497 "Photo.c" +#line 38617 "Photo.c" } else { #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" data1 = param_values->data[0].v_pointer; #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" data2 = closure->data; -#line 38503 "Photo.c" +#line 38623 "Photo.c" } #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" callback = (GMarshalFunc_VOID__OBJECT_MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback); #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" callback (data1, g_value_get_object (param_values + 1), value_get_media_metadata (param_values + 2), data2); -#line 38509 "Photo.c" +#line 38629 "Photo.c" } -static void library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +static void +library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4499 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4499 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38518 "Photo.c" +#line 38642 "Photo.c" } -static void library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +static void +library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4502 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4502 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38527 "Photo.c" +#line 38655 "Photo.c" } -static void library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) { +static void +library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, + LibraryPhoto* photo, + PhotoMetadata* metadata) +{ #line 4505 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 4505 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); -#line 38536 "Photo.c" +#line 38668 "Photo.c" } -static void library_photo_source_collection_class_init (LibraryPhotoSourceCollectionClass * klass) { +static void +library_photo_source_collection_class_init (LibraryPhotoSourceCollectionClass * klass) +{ #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_parent_class = g_type_class_peek_parent (klass); #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38602,11 +38736,13 @@ static void library_photo_source_collection_class_init (LibraryPhotoSourceCollec library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL] = g_signal_new ("baseline-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA); #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL] = g_signal_new ("source-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA); -#line 38601 "Photo.c" +#line 38735 "Photo.c" } -static void library_photo_source_collection_instance_init (LibraryPhotoSourceCollection * self) { +static void +library_photo_source_collection_instance_init (LibraryPhotoSourceCollection * self) +{ GeeHashMap* _tmp0_; GeeHashMap* _tmp1_; GeeTreeMultiMap* _tmp2_; @@ -38641,11 +38777,13 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol _tmp5_ = gee_tree_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 4493 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->photo_to_raw_development_filesize = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 38640 "Photo.c" +#line 38776 "Photo.c" } -static void library_photo_source_collection_finalize (DataCollection * obj) { +static void +library_photo_source_collection_finalize (DataCollection * obj) +{ LibraryPhotoSourceCollection * self; #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection); @@ -38665,11 +38803,13 @@ static void library_photo_source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->photo_to_raw_development_filesize); #line 4463 "/home/jens/Source/shotwell/src/Photo.vala" DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->finalize (obj); -#line 38664 "Photo.c" +#line 38802 "Photo.c" } -GType library_photo_source_collection_get_type (void) { +GType +library_photo_source_collection_get_type (void) +{ static volatile gsize library_photo_source_collection_type_id__volatile = 0; if (g_once_init_enter (&library_photo_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotoSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photo_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhotoSourceCollection), 0, (GInstanceInitFunc) library_photo_source_collection_instance_init, NULL }; @@ -38681,186 +38821,168 @@ GType library_photo_source_collection_get_type (void) { } -static void _library_photo_generate_thumbnails_one_shot_callback (gpointer self) { +static void +_library_photo_generate_thumbnails_one_shot_callback (gpointer self) +{ #line 4985 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_generate_thumbnails ((LibraryPhoto*) self); -#line 38683 "Photo.c" +#line 38825 "Photo.c" } -static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row) { +static LibraryPhoto* +library_photo_construct (GType object_type, + PhotoRow* row) +{ LibraryPhoto * self = NULL; - PhotoRow* _tmp0_; - OneShotScheduler* _tmp1_; - PhotoRow* _tmp2_; - guint64 _tmp3_; - PhotoRow* _tmp7_; - guint64 _tmp8_; + OneShotScheduler* _tmp0_; + guint64 _tmp1_; + guint64 _tmp4_; #line 4980 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_ROW (row), NULL); #line 4981 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = row; -#line 4981 "/home/jens/Source/shotwell/src/Photo.vala" - self = (LibraryPhoto*) photo_construct (object_type, _tmp0_); + self = (LibraryPhoto*) photo_construct (object_type, row); #line 4983 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); #line 4983 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->import_keywords = NULL; #line 4985 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self); + _tmp0_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self); #line 4985 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler); #line 4985 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->thumbnail_scheduler = _tmp1_; + self->priv->thumbnail_scheduler = _tmp0_; #line 4988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = row; + _tmp1_ = row->flags; #line 4988 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_->flags; -#line 4988 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp3_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { -#line 38717 "Photo.c" - LibraryPhotoSourceCollection* _tmp4_; - PhotoRow* _tmp5_; - const gchar* _tmp6_; -#line 4989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = library_photo_global; + if ((_tmp1_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { +#line 38855 "Photo.c" + LibraryPhotoSourceCollection* _tmp2_; + const gchar* _tmp3_; #line 4989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = row; + _tmp2_ = library_photo_global; #line 4989 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp5_->backlinks; + _tmp3_ = row->backlinks; #line 4989 "/home/jens/Source/shotwell/src/Photo.vala" - data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_); -#line 38729 "Photo.c" + data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp3_); +#line 38864 "Photo.c" } #line 4991 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = row; + _tmp4_ = row->flags; #line 4991 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->flags; -#line 4991 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { -#line 38737 "Photo.c" - PhotoRow* _tmp9_; - guint64 _tmp10_; + if ((_tmp4_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { +#line 38870 "Photo.c" + guint64 _tmp5_; #line 4992 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = row; + _tmp5_ = row->flags; #line 4992 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = _tmp9_->flags; -#line 4992 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_upgrade_rating_flags (self, _tmp10_); -#line 38746 "Photo.c" + library_photo_upgrade_rating_flags (self, _tmp5_); +#line 38876 "Photo.c" } #line 4980 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 38750 "Photo.c" +#line 38880 "Photo.c" } -static LibraryPhoto* library_photo_new (PhotoRow* row) { +static LibraryPhoto* +library_photo_new (PhotoRow* row) +{ #line 4980 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_construct (TYPE_LIBRARY_PHOTO, row); -#line 38757 "Photo.c" +#line 38889 "Photo.c" } -static LibraryPhoto* library_photo_construct_from_import_params (GType object_type, PhotoImportParams* import_params) { +static LibraryPhoto* +library_photo_construct_from_import_params (GType object_type, + PhotoImportParams* import_params) +{ LibraryPhoto * self = NULL; - PhotoImportParams* _tmp0_; - PhotoRow* _tmp1_; - PhotoImportParams* _tmp2_; - GeeCollection* _tmp3_; - GeeCollection* _tmp4_; - OneShotScheduler* _tmp5_; - PhotoImportParams* _tmp6_; - PhotoRow* _tmp7_; - guint64 _tmp8_; - PhotoImportParams* _tmp13_; - PhotoRow* _tmp14_; - guint64 _tmp15_; + PhotoRow* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + OneShotScheduler* _tmp3_; + PhotoRow* _tmp4_; + guint64 _tmp5_; + PhotoRow* _tmp9_; + guint64 _tmp10_; #line 4995 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (import_params), NULL); #line 4996 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = import_params; -#line 4996 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _tmp0_->row; + _tmp0_ = import_params->row; #line 4996 "/home/jens/Source/shotwell/src/Photo.vala" - self = (LibraryPhoto*) photo_construct (object_type, _tmp1_); -#line 4998 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = import_params; + self = (LibraryPhoto*) photo_construct (object_type, _tmp0_); #line 4998 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_->keywords; + _tmp1_ = import_params->keywords; #line 4998 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (_tmp1_); #line 4998 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); #line 4998 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->import_keywords = _tmp4_; + self->priv->import_keywords = _tmp2_; #line 4999 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self); + _tmp3_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self); #line 4999 "/home/jens/Source/shotwell/src/Photo.vala" _one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler); #line 4999 "/home/jens/Source/shotwell/src/Photo.vala" - self->priv->thumbnail_scheduler = _tmp5_; -#line 5002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = import_params; + self->priv->thumbnail_scheduler = _tmp3_; #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = _tmp6_->row; + _tmp4_ = import_params->row; #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _tmp7_->flags; + _tmp5_ = _tmp4_->flags; #line 5002 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { -#line 38807 "Photo.c" - LibraryPhotoSourceCollection* _tmp9_; - PhotoImportParams* _tmp10_; - PhotoRow* _tmp11_; - const gchar* _tmp12_; -#line 5003 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = library_photo_global; + if ((_tmp5_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) { +#line 38932 "Photo.c" + LibraryPhotoSourceCollection* _tmp6_; + PhotoRow* _tmp7_; + const gchar* _tmp8_; #line 5003 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = import_params; + _tmp6_ = library_photo_global; #line 5003 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_->row; + _tmp7_ = import_params->row; #line 5003 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_->backlinks; + _tmp8_ = _tmp7_->backlinks; #line 5003 "/home/jens/Source/shotwell/src/Photo.vala" - data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp12_); -#line 38822 "Photo.c" + data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp8_); +#line 38944 "Photo.c" } #line 5005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = import_params; + _tmp9_ = import_params->row; #line 5005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _tmp13_->row; + _tmp10_ = _tmp9_->flags; #line 5005 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp14_->flags; -#line 5005 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp15_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { -#line 38832 "Photo.c" - PhotoImportParams* _tmp16_; - PhotoRow* _tmp17_; - guint64 _tmp18_; -#line 5006 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = import_params; + if ((_tmp10_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) { +#line 38952 "Photo.c" + PhotoRow* _tmp11_; + guint64 _tmp12_; #line 5006 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = _tmp16_->row; + _tmp11_ = import_params->row; #line 5006 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = _tmp17_->flags; + _tmp12_ = _tmp11_->flags; #line 5006 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_upgrade_rating_flags (self, _tmp18_); -#line 38844 "Photo.c" + library_photo_upgrade_rating_flags (self, _tmp12_); +#line 38961 "Photo.c" } #line 4995 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 38848 "Photo.c" +#line 38965 "Photo.c" } -static LibraryPhoto* library_photo_new_from_import_params (PhotoImportParams* import_params) { +static LibraryPhoto* +library_photo_new_from_import_params (PhotoImportParams* import_params) +{ #line 4995 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_construct_from_import_params (TYPE_LIBRARY_PHOTO, import_params); -#line 38855 "Photo.c" +#line 38974 "Photo.c" } -void library_photo_init (ProgressMonitor monitor, void* monitor_target) { +void +library_photo_init (ProgressMonitor monitor, + void* monitor_target) +{ LibraryPhotoSourceCollection* _tmp0_; GeeArrayList* all = NULL; PhotoTable* _tmp1_; @@ -38877,14 +38999,14 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { GeeArrayList* _tmp8_; gint _tmp9_; gint _tmp10_; - LibraryPhotoSourceCollection* _tmp34_; - GeeArrayList* _tmp35_; - GeeCollection* _tmp36_; - GeeCollection* _tmp37_; + LibraryPhotoSourceCollection* _tmp32_; + GeeArrayList* _tmp33_; + GeeCollection* _tmp34_; + GeeCollection* _tmp35_; + LibraryPhotoSourceCollection* _tmp36_; + GeeArrayList* _tmp37_; LibraryPhotoSourceCollection* _tmp38_; GeeArrayList* _tmp39_; - LibraryPhotoSourceCollection* _tmp40_; - GeeArrayList* _tmp41_; #line 5010 "/home/jens/Source/shotwell/src/Photo.vala" photo_init_photo (); #line 5012 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38925,19 +39047,19 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp10_ = _tmp9_; #line 5020 "/home/jens/Source/shotwell/src/Photo.vala" count = _tmp10_; -#line 38924 "Photo.c" +#line 39046 "Photo.c" { gint ctr = 0; #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" ctr = 0; -#line 38929 "Photo.c" +#line 39051 "Photo.c" { gboolean _tmp11_ = FALSE; #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = TRUE; #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 38936 "Photo.c" +#line 39058 "Photo.c" gint _tmp13_; gint _tmp14_; PhotoRow* row = NULL; @@ -38951,17 +39073,15 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { PhotoRow* _tmp20_; guint64 _tmp21_; guint64 _tmp22_; - ProgressMonitor _tmp30_; - void* _tmp30__target; #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp11_) { -#line 38954 "Photo.c" +#line 39074 "Photo.c" gint _tmp12_; #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = ctr; #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" ctr = _tmp12_ + 1; -#line 38960 "Photo.c" +#line 39080 "Photo.c" } #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _tmp11_ = FALSE; @@ -38973,7 +39093,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { if (!(_tmp13_ < _tmp14_)) { #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 38972 "Photo.c" +#line 39092 "Photo.c" } #line 5022 "/home/jens/Source/shotwell/src/Photo.vala" _tmp15_ = all; @@ -38999,7 +39119,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp22_ = flags; #line 5026 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp22_ & LIBRARY_PHOTO_FLAG_TRASH) != ((guint64) 0)) { -#line 38998 "Photo.c" +#line 39118 "Photo.c" GeeArrayList* _tmp23_; LibraryPhoto* _tmp24_; #line 5027 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39008,14 +39128,14 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp24_ = photo; #line 5027 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); -#line 39007 "Photo.c" +#line 39127 "Photo.c" } else { guint64 _tmp25_; #line 5028 "/home/jens/Source/shotwell/src/Photo.vala" _tmp25_ = flags; #line 5028 "/home/jens/Source/shotwell/src/Photo.vala" if ((_tmp25_ & LIBRARY_PHOTO_FLAG_OFFLINE) != ((guint64) 0)) { -#line 39014 "Photo.c" +#line 39134 "Photo.c" GeeArrayList* _tmp26_; LibraryPhoto* _tmp27_; #line 5029 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39024,7 +39144,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp27_ = photo; #line 5029 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_); -#line 39023 "Photo.c" +#line 39143 "Photo.c" } else { GeeArrayList* _tmp28_; LibraryPhoto* _tmp29_; @@ -39034,62 +39154,52 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _tmp29_ = photo; #line 5031 "/home/jens/Source/shotwell/src/Photo.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); -#line 39033 "Photo.c" +#line 39153 "Photo.c" } } #line 5033 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = monitor; -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30__target = monitor_target; -#line 5033 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp30_ != NULL) { -#line 39042 "Photo.c" - ProgressMonitor _tmp31_; - void* _tmp31__target; - gint _tmp32_; - gint _tmp33_; + if (monitor != NULL) { +#line 39158 "Photo.c" + gint _tmp30_; + gint _tmp31_; #line 5034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = monitor; + _tmp30_ = ctr; #line 5034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31__target = monitor_target; + _tmp31_ = count; #line 5034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = ctr; -#line 5034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = count; -#line 5034 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ ((guint64) _tmp32_, (guint64) _tmp33_, TRUE, _tmp31__target); -#line 39057 "Photo.c" + monitor ((guint64) _tmp30_, (guint64) _tmp31_, TRUE, monitor_target); +#line 39167 "Photo.c" } #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 5021 "/home/jens/Source/shotwell/src/Photo.vala" _photo_row_unref0 (row); -#line 39063 "Photo.c" +#line 39173 "Photo.c" } } } #line 5037 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = library_photo_global; + _tmp32_ = library_photo_global; #line 5037 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = all_photos; + _tmp33_ = all_photos; #line 5037 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp34_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 5037 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tmp36_; + _tmp35_ = _tmp34_; #line 5037 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp37_); + _g_object_unref0 (_tmp35_); #line 5038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = library_photo_global; + _tmp36_ = library_photo_global; #line 5038 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = trashed_photos; + _tmp37_ = trashed_photos; #line 5038 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection)); + media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); #line 5039 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = library_photo_global; + _tmp38_ = library_photo_global; #line 5039 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = offline_photos; + _tmp39_ = offline_photos; #line 5039 "/home/jens/Source/shotwell/src/Photo.vala" - media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection)); + media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection)); #line 5009 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (offline_photos); #line 5009 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39098,30 +39208,32 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) { _g_object_unref0 (all_photos); #line 5009 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (all); -#line 39097 "Photo.c" +#line 39207 "Photo.c" } -void library_photo_terminate (void) { +void +library_photo_terminate (void) +{ #line 5043 "/home/jens/Source/shotwell/src/Photo.vala" photo_terminate_photo (); -#line 39104 "Photo.c" +#line 39216 "Photo.c" } -ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto* * photo) { +ImportResult +library_photo_import_create (PhotoImportParams* params, + LibraryPhoto* * photo) +{ LibraryPhoto* _vala_photo = NULL; ImportResult result = 0; PhotoID photo_id = {0}; PhotoTable* _tmp0_; PhotoTable* _tmp1_; - PhotoImportParams* _tmp2_; - PhotoRow* _tmp3_; - PhotoID _tmp4_ = {0}; - PhotoID _tmp5_; - gboolean _tmp6_; - PhotoImportParams* _tmp7_; - LibraryPhoto* _tmp8_; + PhotoRow* _tmp2_; + PhotoID _tmp3_ = {0}; + PhotoID _tmp4_; + LibraryPhoto* _tmp5_; #line 5050 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0); #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39129,21 +39241,17 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = params; -#line 5052 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_->row; + _tmp2_ = params->row; #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_add (_tmp1_, _tmp3_, &_tmp4_); + photo_table_add (_tmp1_, _tmp2_, &_tmp3_); #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); #line 5052 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id = _tmp5_; + photo_id = _tmp4_; #line 5053 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = photo_id_is_invalid (&photo_id); -#line 5053 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { + if (photo_id_is_invalid (&photo_id)) { #line 5054 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); #line 5054 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39154,69 +39262,66 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot if (photo) { #line 5056 "/home/jens/Source/shotwell/src/Photo.vala" *photo = _vala_photo; -#line 39153 "Photo.c" +#line 39261 "Photo.c" } else { #line 5056 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 39157 "Photo.c" +#line 39265 "Photo.c" } #line 5056 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39161 "Photo.c" +#line 39269 "Photo.c" } #line 5060 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = params; -#line 5060 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = library_photo_new_from_import_params (_tmp7_); + _tmp5_ = library_photo_new_from_import_params (params); #line 5060 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); #line 5060 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_photo = _tmp8_; + _vala_photo = _tmp5_; #line 5062 "/home/jens/Source/shotwell/src/Photo.vala" result = IMPORT_RESULT_SUCCESS; #line 5062 "/home/jens/Source/shotwell/src/Photo.vala" if (photo) { #line 5062 "/home/jens/Source/shotwell/src/Photo.vala" *photo = _vala_photo; -#line 39177 "Photo.c" +#line 39283 "Photo.c" } else { #line 5062 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_vala_photo); -#line 39181 "Photo.c" +#line 39287 "Photo.c" } #line 5062 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39185 "Photo.c" +#line 39291 "Photo.c" } -void library_photo_import_failed (LibraryPhoto* photo) { +void +library_photo_import_failed (LibraryPhoto* photo) +{ GError * _inner_error_ = NULL; #line 5065 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); -#line 39193 "Photo.c" +#line 39301 "Photo.c" { PhotoTable* _tmp0_; PhotoTable* _tmp1_; - LibraryPhoto* _tmp2_; - PhotoID _tmp3_ = {0}; + PhotoID _tmp2_ = {0}; #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = photo_table_get_instance (); #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = _tmp0_; #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo; + photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), &_tmp2_); #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" - photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo), &_tmp3_); -#line 5067 "/home/jens/Source/shotwell/src/Photo.vala" - photo_table_remove (_tmp1_, &_tmp3_, &_inner_error_); + photo_table_remove (_tmp1_, &_tmp2_, &_inner_error_); #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" _database_table_unref0 (_tmp1_); #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 39215 "Photo.c" +#line 39320 "Photo.c" goto __catch419_database_error; } #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39225,25 +39330,25 @@ void library_photo_import_failed (LibraryPhoto* photo) { g_clear_error (&_inner_error_); #line 5067 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39224 "Photo.c" +#line 39329 "Photo.c" } } goto __finally419; __catch419_database_error: { GError* err = NULL; - GError* _tmp4_; + GError* _tmp3_; #line 5066 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 5066 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 5069 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = err; + _tmp3_ = err; #line 5069 "/home/jens/Source/shotwell/src/Photo.vala" - app_window_database_error (_tmp4_); + app_window_database_error (_tmp3_); #line 5066 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39242 "Photo.c" +#line 39347 "Photo.c" } __finally419: #line 5066 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39254,114 +39359,104 @@ void library_photo_import_failed (LibraryPhoto* photo) { g_clear_error (&_inner_error_); #line 5066 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39253 "Photo.c" +#line 39358 "Photo.c" } } -static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetadata* metadata) { +static void +library_photo_real_notify_master_reimported (Photo* base, + PhotoMetadata* metadata) +{ LibraryPhoto * self; - PhotoMetadata* _tmp0_; - LibraryPhotoSourceCollection* _tmp1_; - PhotoMetadata* _tmp2_; + LibraryPhotoSourceCollection* _tmp0_; #line 5073 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5073 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 5074 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 5074 "/home/jens/Source/shotwell/src/Photo.vala" - PHOTO_CLASS (library_photo_parent_class)->notify_master_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); + PHOTO_CLASS (library_photo_parent_class)->notify_master_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), metadata); #line 5076 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = library_photo_global; + _tmp0_ = library_photo_global; #line 5076 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; -#line 5076 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_notify_master_reimported (_tmp1_, self, _tmp2_); -#line 39277 "Photo.c" + library_photo_source_collection_notify_master_reimported (_tmp0_, self, metadata); +#line 39379 "Photo.c" } -static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMetadata* metadata) { +static void +library_photo_real_notify_editable_reimported (Photo* base, + PhotoMetadata* metadata) +{ LibraryPhoto * self; - PhotoMetadata* _tmp0_; - LibraryPhotoSourceCollection* _tmp1_; - PhotoMetadata* _tmp2_; + LibraryPhotoSourceCollection* _tmp0_; #line 5079 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5079 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 5080 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 5080 "/home/jens/Source/shotwell/src/Photo.vala" - PHOTO_CLASS (library_photo_parent_class)->notify_editable_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); + PHOTO_CLASS (library_photo_parent_class)->notify_editable_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), metadata); #line 5082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = library_photo_global; + _tmp0_ = library_photo_global; #line 5082 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; -#line 5082 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_notify_editable_reimported (_tmp1_, self, _tmp2_); -#line 39300 "Photo.c" + library_photo_source_collection_notify_editable_reimported (_tmp0_, self, metadata); +#line 39399 "Photo.c" } -static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetadata* metadata) { +static void +library_photo_real_notify_source_reimported (Photo* base, + PhotoMetadata* metadata) +{ LibraryPhoto * self; - PhotoMetadata* _tmp0_; - LibraryPhotoSourceCollection* _tmp1_; - PhotoMetadata* _tmp2_; + LibraryPhotoSourceCollection* _tmp0_; #line 5085 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5085 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 5086 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 5086 "/home/jens/Source/shotwell/src/Photo.vala" - PHOTO_CLASS (library_photo_parent_class)->notify_source_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); -#line 5088 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = library_photo_global; + PHOTO_CLASS (library_photo_parent_class)->notify_source_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), metadata); #line 5088 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; + _tmp0_ = library_photo_global; #line 5088 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_notify_source_reimported (_tmp1_, self, _tmp2_); -#line 39323 "Photo.c" + library_photo_source_collection_notify_source_reimported (_tmp0_, self, metadata); +#line 39419 "Photo.c" } -static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMetadata* metadata) { +static void +library_photo_real_notify_baseline_reimported (Photo* base, + PhotoMetadata* metadata) +{ LibraryPhoto * self; - PhotoMetadata* _tmp0_; - LibraryPhotoSourceCollection* _tmp1_; - PhotoMetadata* _tmp2_; + LibraryPhotoSourceCollection* _tmp0_; #line 5091 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5091 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata)); #line 5092 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 5092 "/home/jens/Source/shotwell/src/Photo.vala" - PHOTO_CLASS (library_photo_parent_class)->notify_baseline_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); -#line 5094 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = library_photo_global; + PHOTO_CLASS (library_photo_parent_class)->notify_baseline_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), metadata); #line 5094 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; + _tmp0_ = library_photo_global; #line 5094 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_source_collection_notify_baseline_reimported (_tmp1_, self, _tmp2_); -#line 39346 "Photo.c" + library_photo_source_collection_notify_baseline_reimported (_tmp0_, self, metadata); +#line 39439 "Photo.c" } -static void library_photo_generate_thumbnails (LibraryPhoto* self) { +static void +library_photo_generate_thumbnails (LibraryPhoto* self) +{ GError * _inner_error_ = NULL; #line 5097 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); -#line 39354 "Photo.c" +#line 39449 "Photo.c" { #line 5099 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_cache_import_from_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TRUE, &_inner_error_); #line 5099 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 39360 "Photo.c" +#line 39455 "Photo.c" goto __catch420_g_error; } } @@ -39391,7 +39486,7 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) { _g_free0 (_tmp1_); #line 5098 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39390 "Photo.c" +#line 39485 "Photo.c" } __finally420: #line 5098 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39402,15 +39497,17 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) { g_clear_error (&_inner_error_); #line 5098 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39401 "Photo.c" +#line 39496 "Photo.c" } #line 5105 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 39405 "Photo.c" +#line 39500 "Photo.c" } -GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) { +GeeCollection* +library_photo_get_import_keywords (LibraryPhoto* self) +{ GeeCollection* result = NULL; GeeCollection* _tmp0_; GeeCollection* _tmp1_; @@ -39424,26 +39521,30 @@ GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) { result = _tmp1_; #line 5110 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39423 "Photo.c" +#line 39520 "Photo.c" } -void library_photo_clear_import_keywords (LibraryPhoto* self) { +void +library_photo_clear_import_keywords (LibraryPhoto* self) +{ #line 5113 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); #line 5114 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (self->priv->import_keywords); #line 5114 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->import_keywords = NULL; -#line 39434 "Photo.c" +#line 39533 "Photo.c" } -static void library_photo_real_notify_altered (DataObject* base, Alteration* alteration) { +static void +library_photo_real_notify_altered (DataObject* base, + Alteration* alteration) +{ LibraryPhoto * self; gboolean _tmp0_ = FALSE; gboolean _tmp1_; - Alteration* _tmp5_; #line 5117 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5117 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39452,40 +39553,35 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt _tmp1_ = self->priv->block_thumbnail_generation; #line 5119 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp1_) { -#line 39451 "Photo.c" - Alteration* _tmp2_; - gboolean _tmp3_; -#line 5119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = alteration; #line 5119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = alteration_has_subject (_tmp2_, "image"); -#line 5119 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_; -#line 39460 "Photo.c" + _tmp0_ = alteration_has_subject (alteration, "image"); +#line 39554 "Photo.c" } else { #line 5119 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = FALSE; -#line 39464 "Photo.c" +#line 39558 "Photo.c" } #line 5119 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { -#line 39468 "Photo.c" - OneShotScheduler* _tmp4_; +#line 39562 "Photo.c" + OneShotScheduler* _tmp2_; #line 5120 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->thumbnail_scheduler; + _tmp2_ = self->priv->thumbnail_scheduler; #line 5120 "/home/jens/Source/shotwell/src/Photo.vala" - one_shot_scheduler_at_priority_idle (_tmp4_, G_PRIORITY_LOW); -#line 39474 "Photo.c" + one_shot_scheduler_at_priority_idle (_tmp2_, G_PRIORITY_LOW); +#line 39568 "Photo.c" } #line 5122 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = alteration; -#line 5122 "/home/jens/Source/shotwell/src/Photo.vala" - DATA_OBJECT_CLASS (library_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp5_); -#line 39480 "Photo.c" + 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), alteration); +#line 39572 "Photo.c" } -static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error) { +static GdkPixbuf* +library_photo_real_get_preview_pixbuf (MediaSource* base, + Scaling* scaling, + GError** error) +{ LibraryPhoto * self; GdkPixbuf* result = NULL; GdkPixbuf* pixbuf = NULL; @@ -39506,7 +39602,7 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal g_propagate_error (error, _inner_error_); #line 5126 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39505 "Photo.c" +#line 39601 "Photo.c" } #line 5128 "/home/jens/Source/shotwell/src/Photo.vala" _tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_BILINEAR, TRUE); @@ -39516,34 +39612,31 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal _g_object_unref0 (pixbuf); #line 5128 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39515 "Photo.c" +#line 39611 "Photo.c" } -static void library_photo_real_rotate (Photo* base, Rotation rotation) { +static void +library_photo_real_rotate (Photo* base, + Rotation rotation) +{ LibraryPhoto * self; - Rotation _tmp0_; GError * _inner_error_ = NULL; #line 5131 "/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" self->priv->block_thumbnail_generation = TRUE; #line 5134 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = rotation; -#line 5134 "/home/jens/Source/shotwell/src/Photo.vala" - PHOTO_CLASS (library_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); + PHOTO_CLASS (library_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), rotation); #line 5135 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->block_thumbnail_generation = FALSE; -#line 39533 "Photo.c" +#line 39629 "Photo.c" { - Rotation _tmp1_; -#line 5143 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = rotation; #line 5143 "/home/jens/Source/shotwell/src/Photo.vala" - thumbnail_cache_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_); + thumbnail_cache_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), rotation, &_inner_error_); #line 5143 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 39542 "Photo.c" +#line 39635 "Photo.c" goto __catch421_g_error; } } @@ -39551,29 +39644,29 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) { __catch421_g_error: { GError* err = NULL; - gchar* _tmp2_; - gchar* _tmp3_; - GError* _tmp4_; - const gchar* _tmp5_; + gchar* _tmp0_; + gchar* _tmp1_; + GError* _tmp2_; + const gchar* _tmp3_; #line 5142 "/home/jens/Source/shotwell/src/Photo.vala" err = _inner_error_; #line 5142 "/home/jens/Source/shotwell/src/Photo.vala" _inner_error_ = NULL; #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = err; + _tmp2_ = err; #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->message; + _tmp3_ = _tmp2_->message; #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" - g_warning ("Photo.vala:5146: Unable to update thumbnails for %s: %s", _tmp3_, _tmp5_); + g_warning ("Photo.vala:5146: Unable to update thumbnails for %s: %s", _tmp1_, _tmp3_); #line 5146 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp1_); #line 5142 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 39572 "Photo.c" +#line 39665 "Photo.c" } __finally421: #line 5142 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39584,69 +39677,76 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) { g_clear_error (&_inner_error_); #line 5142 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39583 "Photo.c" +#line 39676 "Photo.c" } #line 5149 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 39587 "Photo.c" +#line 39680 "Photo.c" } -static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +library_photo_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ LibraryPhoto * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - gint _tmp1_; + GdkPixbuf* _tmp1_; GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; GError * _inner_error_ = NULL; #line 5153 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = scale; -#line 5154 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_); + _tmp1_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), scale, &_inner_error_); #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp2_; + _tmp0_ = _tmp1_; #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39613 "Photo.c" +#line 39707 "Photo.c" } #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp0_; + _tmp2_ = _tmp0_; #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = NULL; #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; + result = _tmp2_; #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp0_); #line 5154 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 39625 "Photo.c" +#line 39719 "Photo.c" } -static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, gint64 total_num_bytes, gpointer self) { +static void +_library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, + gint64 total_num_bytes, + gpointer self) +{ #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_on_duplicate_progress ((LibraryPhoto*) self, current_num_bytes, total_num_bytes); -#line 39632 "Photo.c" +#line 39730 "Photo.c" } -static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPhotoRow* backing, BackingPhotoID* result, GError** error) { +static void +library_photo_duplicate_backing_photo (LibraryPhoto* self, + BackingPhotoRow* backing, + BackingPhotoID* result, + GError** error) +{ BackingPhotoID backing_id = {0}; gboolean _tmp0_ = FALSE; - BackingPhotoRow* _tmp1_; GFile* file = NULL; - BackingPhotoRow* _tmp4_; - const gchar* _tmp5_; - GFile* _tmp6_; - GFile* _tmp7_; - gboolean _tmp8_; + const gchar* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; GError * _inner_error_ = NULL; #line 5159 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); @@ -39655,22 +39755,17 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh #line 5160 "/home/jens/Source/shotwell/src/Photo.vala" backing_photo_id_init (&backing_id, BACKING_PHOTO_ID_INVALID); #line 5161 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = backing; -#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_ == NULL) { + if (backing == NULL) { #line 5161 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = TRUE; -#line 39659 "Photo.c" +#line 39757 "Photo.c" } else { - BackingPhotoRow* _tmp2_; - const gchar* _tmp3_; -#line 5161 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = backing; + const gchar* _tmp1_; #line 5161 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _tmp2_->filepath; + _tmp1_ = backing->filepath; #line 5161 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp3_ == NULL; -#line 39669 "Photo.c" + _tmp0_ = _tmp1_ == NULL; +#line 39764 "Photo.c" } #line 5161 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp0_) { @@ -39678,38 +39773,34 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh *result = backing_id; #line 5162 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39677 "Photo.c" +#line 39772 "Photo.c" } #line 5164 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = backing; + _tmp2_ = backing->filepath; #line 5164 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _tmp4_->filepath; + _tmp3_ = g_file_new_for_path (_tmp2_); #line 5164 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = g_file_new_for_path (_tmp5_); -#line 5164 "/home/jens/Source/shotwell/src/Photo.vala" - file = _tmp6_; -#line 5165 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = file; + file = _tmp3_; #line 5165 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = g_file_query_exists (_tmp7_, NULL); + _tmp4_ = file; #line 5165 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_) { -#line 39693 "Photo.c" + if (g_file_query_exists (_tmp4_, NULL)) { +#line 39784 "Photo.c" GFile* dupe_file = NULL; - GFile* _tmp9_; - GFile* _tmp10_; + GFile* _tmp5_; + GFile* _tmp6_; DetectedPhotoInformation* detected = NULL; BackingPhotoRow* state = NULL; - GFile* _tmp11_; - DetectedPhotoInformation* _tmp12_ = NULL; - BackingPhotoRow* _tmp13_; - BackingPhotoRow* _tmp14_; + GFile* _tmp7_; + DetectedPhotoInformation* _tmp8_ = NULL; + BackingPhotoRow* _tmp9_; + BackingPhotoRow* _tmp10_; #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = file; + _tmp5_ = file; #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = library_files_duplicate (_tmp9_, _library_photo_on_duplicate_progress_gfile_progress_callback, self, TRUE, &_inner_error_); + _tmp6_ = library_files_duplicate (_tmp5_, _library_photo_on_duplicate_progress_gfile_progress_callback, self, TRUE, &_inner_error_); #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" - dupe_file = _tmp10_; + dupe_file = _tmp6_; #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39718,18 +39809,18 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _g_object_unref0 (file); #line 5166 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39717 "Photo.c" +#line 39808 "Photo.c" } #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = dupe_file; + _tmp7_ = dupe_file; #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_query_backing_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp11_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp12_, &_inner_error_); + _tmp9_ = photo_query_backing_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp7_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp8_, &_inner_error_); #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" _detected_photo_information_unref0 (detected); #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" - detected = _tmp12_; + detected = _tmp8_; #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" - state = _tmp13_; + state = _tmp9_; #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39742,28 +39833,28 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _g_object_unref0 (file); #line 5169 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39741 "Photo.c" +#line 39832 "Photo.c" } #line 5171 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = state; + _tmp10_ = state; #line 5171 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_ != NULL) { -#line 39747 "Photo.c" - BackingPhotoTable* _tmp15_; - BackingPhotoTable* _tmp16_; - BackingPhotoRow* _tmp17_; - BackingPhotoRow* _tmp18_; - BackingPhotoID _tmp19_; + if (_tmp10_ != NULL) { +#line 39838 "Photo.c" + BackingPhotoTable* _tmp11_; + BackingPhotoTable* _tmp12_; + BackingPhotoRow* _tmp13_; + BackingPhotoRow* _tmp14_; + BackingPhotoID _tmp15_; #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = backing_photo_table_get_instance (); + _tmp11_ = backing_photo_table_get_instance (); #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = state; + _tmp13_ = state; #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" - backing_photo_table_add (_tmp16_, _tmp17_, &_inner_error_); + backing_photo_table_add (_tmp12_, _tmp13_, &_inner_error_); #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" - _database_table_unref0 (_tmp16_); + _database_table_unref0 (_tmp12_); #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" @@ -39778,15 +39869,15 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _g_object_unref0 (file); #line 5172 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39777 "Photo.c" +#line 39868 "Photo.c" } #line 5173 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = state; + _tmp14_ = state; #line 5173 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = _tmp18_->id; + _tmp15_ = _tmp14_->id; #line 5173 "/home/jens/Source/shotwell/src/Photo.vala" - backing_id = _tmp19_; -#line 39785 "Photo.c" + backing_id = _tmp15_; +#line 39876 "Photo.c" } #line 5165 "/home/jens/Source/shotwell/src/Photo.vala" _backing_photo_row_unref0 (state); @@ -39794,7 +39885,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _detected_photo_information_unref0 (detected); #line 5165 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (dupe_file); -#line 39793 "Photo.c" +#line 39884 "Photo.c" } #line 5177 "/home/jens/Source/shotwell/src/Photo.vala" *result = backing_id; @@ -39802,11 +39893,14 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh _g_object_unref0 (file); #line 5177 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 39801 "Photo.c" +#line 39892 "Photo.c" } -LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { +LibraryPhoto* +library_photo_duplicate (LibraryPhoto* self, + GError** error) +{ LibraryPhoto* result = NULL; GFile* dupe_file = NULL; GFile* _tmp0_; @@ -39887,7 +39981,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { g_propagate_error (error, _inner_error_); #line 5182 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39886 "Photo.c" +#line 39980 "Photo.c" } #line 5185 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)); @@ -39909,7 +40003,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5185 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39908 "Photo.c" +#line 40002 "Photo.c" } #line 5186 "/home/jens/Source/shotwell/src/Photo.vala" _tmp8_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL); @@ -39931,7 +40025,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5186 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39930 "Photo.c" +#line 40024 "Photo.c" } #line 5188 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA); @@ -39953,7 +40047,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5188 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39952 "Photo.c" +#line 40046 "Photo.c" } #line 5190 "/home/jens/Source/shotwell/src/Photo.vala" _tmp16_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_EMBEDDED); @@ -39975,7 +40069,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5190 "/home/jens/Source/shotwell/src/Photo.vala" return NULL; -#line 39974 "Photo.c" +#line 40068 "Photo.c" } #line 5194 "/home/jens/Source/shotwell/src/Photo.vala" _tmp20_ = photo_table_get_instance (); @@ -40049,7 +40143,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (_tmp44_); #line 5208 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp45_) { -#line 40048 "Photo.c" +#line 40142 "Photo.c" LibraryPhoto* _tmp46_; Event* _tmp47_; Event* _tmp48_; @@ -40066,7 +40160,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { event_attach (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_MEDIA_SOURCE, MediaSource)); #line 5209 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tmp48_); -#line 40065 "Photo.c" +#line 40159 "Photo.c" } #line 5212 "/home/jens/Source/shotwell/src/Photo.vala" _tmp50_ = tag_global; @@ -40078,7 +40172,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _tmp52_ = tags; #line 5213 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp52_ != NULL) { -#line 40077 "Photo.c" +#line 40171 "Photo.c" { GeeIterator* _tag_it = NULL; GeeCollection* _tmp53_; @@ -40091,43 +40185,40 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _tag_it = _tmp54_; #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40090 "Photo.c" +#line 40184 "Photo.c" GeeIterator* _tmp55_; - gboolean _tmp56_; Tag* tag = NULL; - GeeIterator* _tmp57_; - gpointer _tmp58_; - Tag* _tmp59_; - LibraryPhoto* _tmp60_; + GeeIterator* _tmp56_; + gpointer _tmp57_; + Tag* _tmp58_; + LibraryPhoto* _tmp59_; #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _tmp55_ = _tag_it; #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = gee_iterator_next (_tmp55_); -#line 5214 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp56_) { + if (!gee_iterator_next (_tmp55_)) { #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 40106 "Photo.c" +#line 40197 "Photo.c" } #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = _tag_it; + _tmp56_ = _tag_it; #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = gee_iterator_get (_tmp57_); + _tmp57_ = gee_iterator_get (_tmp56_); #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" - tag = (Tag*) _tmp58_; + tag = (Tag*) _tmp57_; #line 5215 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = tag; + _tmp58_ = tag; #line 5215 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = dupe; + _tmp59_ = dupe; #line 5215 "/home/jens/Source/shotwell/src/Photo.vala" - tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource)); + tag_attach (_tmp58_, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_MEDIA_SOURCE, MediaSource)); #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 40122 "Photo.c" +#line 40213 "Photo.c" } #line 5214 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_it); -#line 40126 "Photo.c" +#line 40217 "Photo.c" } } #line 5219 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40140,136 +40231,144 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) { _g_object_unref0 (dupe_file); #line 5219 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40139 "Photo.c" +#line 40230 "Photo.c" } -static void library_photo_on_duplicate_progress (LibraryPhoto* self, gint64 current, gint64 total) { +static void +library_photo_on_duplicate_progress (LibraryPhoto* self, + gint64 current, + gint64 total) +{ #line 5222 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); #line 5223 "/home/jens/Source/shotwell/src/Photo.vala" spin_event_loop (); -#line 40148 "Photo.c" +#line 40243 "Photo.c" } -static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flags) { - guint64 _tmp0_; - guint64 _tmp1_; +static void +library_photo_upgrade_rating_flags (LibraryPhoto* self, + guint64 flags) +{ #line 5226 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO (self)); #line 5227 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = flags; -#line 5227 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp0_ & LIBRARY_PHOTO_FLAG_HIDDEN) != ((guint64) 0)) { + if ((flags & LIBRARY_PHOTO_FLAG_HIDDEN) != ((guint64) 0)) { #line 5228 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_REJECTED); #line 5229 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_HIDDEN, NULL); -#line 40165 "Photo.c" +#line 40259 "Photo.c" } #line 5232 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = flags; -#line 5232 "/home/jens/Source/shotwell/src/Photo.vala" - if ((_tmp1_ & LIBRARY_PHOTO_FLAG_FAVORITE) != ((guint64) 0)) { + if ((flags & LIBRARY_PHOTO_FLAG_FAVORITE) != ((guint64) 0)) { #line 5233 "/home/jens/Source/shotwell/src/Photo.vala" media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_FIVE); #line 5234 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FAVORITE, NULL); -#line 40175 "Photo.c" +#line 40267 "Photo.c" } } -static gboolean library_photo_real_is_trashed (MediaSource* base) { +static gboolean +library_photo_real_is_trashed (MediaSource* base) +{ LibraryPhoto * self; gboolean result = FALSE; - gboolean _tmp0_; #line 5239 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5240 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH); -#line 5240 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH); #line 5240 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40192 "Photo.c" +#line 40283 "Photo.c" } -static void library_photo_real_trash (MediaSource* base) { +static void +library_photo_real_trash (MediaSource* base) +{ LibraryPhoto * self; #line 5243 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5244 "/home/jens/Source/shotwell/src/Photo.vala" photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL); -#line 40202 "Photo.c" +#line 40295 "Photo.c" } -static void library_photo_real_untrash (MediaSource* base) { +static void +library_photo_real_untrash (MediaSource* base) +{ LibraryPhoto * self; #line 5247 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5248 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL); -#line 40212 "Photo.c" +#line 40307 "Photo.c" } -static gboolean library_photo_real_is_offline (Monitorable* base) { +static gboolean +library_photo_real_is_offline (Monitorable* base) +{ LibraryPhoto * self; gboolean result = FALSE; - gboolean _tmp0_; #line 5251 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5252 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE); -#line 5252 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE); #line 5252 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40228 "Photo.c" +#line 40322 "Photo.c" } -static void library_photo_real_mark_offline (Monitorable* base) { +static void +library_photo_real_mark_offline (Monitorable* base) +{ LibraryPhoto * self; #line 5255 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5256 "/home/jens/Source/shotwell/src/Photo.vala" photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL); -#line 40238 "Photo.c" +#line 40334 "Photo.c" } -static void library_photo_real_mark_online (Monitorable* base) { +static void +library_photo_real_mark_online (Monitorable* base) +{ LibraryPhoto * self; #line 5259 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5260 "/home/jens/Source/shotwell/src/Photo.vala" photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL); -#line 40248 "Photo.c" +#line 40346 "Photo.c" } -static gboolean library_photo_real_is_flagged (Flaggable* base) { +static gboolean +library_photo_real_is_flagged (Flaggable* base) +{ LibraryPhoto * self; gboolean result = FALSE; - gboolean _tmp0_; #line 5263 "/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" - _tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED); -#line 5264 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp0_; + result = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED); #line 5264 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40264 "Photo.c" +#line 40361 "Photo.c" } -static void library_photo_real_mark_flagged (Flaggable* base) { +static void +library_photo_real_mark_flagged (Flaggable* base) +{ LibraryPhoto * self; Alteration* _tmp0_; Alteration* _tmp1_; @@ -40283,11 +40382,13 @@ static void library_photo_real_mark_flagged (Flaggable* base) { photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_); #line 5268 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp1_); -#line 40282 "Photo.c" +#line 40381 "Photo.c" } -static void library_photo_real_mark_unflagged (Flaggable* base) { +static void +library_photo_real_mark_unflagged (Flaggable* base) +{ LibraryPhoto * self; Alteration* _tmp0_; Alteration* _tmp1_; @@ -40301,32 +40402,31 @@ static void library_photo_real_mark_unflagged (Flaggable* base) { photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_); #line 5272 "/home/jens/Source/shotwell/src/Photo.vala" _alteration_unref0 (_tmp1_); -#line 40300 "Photo.c" +#line 40401 "Photo.c" } -static gboolean library_photo_real_internal_delete_backing (DataSource* base, GError** error) { +static gboolean +library_photo_real_internal_delete_backing (DataSource* base, + GError** error) +{ LibraryPhoto * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gboolean _tmp1_; - gboolean _tmp3_; GError * _inner_error_ = NULL; #line 5275 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5278 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = DATA_SOURCE_CLASS (library_photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource), &_inner_error_); -#line 5278 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _tmp1_; + _tmp0_ = 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 5278 "/home/jens/Source/shotwell/src/Photo.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 40319 "Photo.c" - gboolean _tmp2_ = FALSE; +#line 40419 "Photo.c" + gboolean _tmp1_ = FALSE; #line 5278 "/home/jens/Source/shotwell/src/Photo.vala" g_propagate_error (error, _inner_error_); #line 5278 "/home/jens/Source/shotwell/src/Photo.vala" - return _tmp2_; -#line 40325 "Photo.c" + return _tmp1_; +#line 40425 "Photo.c" } #line 5278 "/home/jens/Source/shotwell/src/Photo.vala" if (!_tmp0_) { @@ -40334,19 +40434,19 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE result = FALSE; #line 5279 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40333 "Photo.c" +#line 40433 "Photo.c" } #line 5281 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5281 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp3_; + result = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 5281 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40341 "Photo.c" +#line 40439 "Photo.c" } -static void library_photo_real_destroy (DataSource* base) { +static void +library_photo_real_destroy (DataSource* base) +{ LibraryPhoto * self; PhotoID photo_id = {0}; PhotoID _tmp0_ = {0}; @@ -40359,7 +40459,7 @@ static void library_photo_real_destroy (DataSource* base) { photo_id = _tmp0_; #line 5288 "/home/jens/Source/shotwell/src/Photo.vala" thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 40358 "Photo.c" +#line 40458 "Photo.c" { PhotoTable* _tmp1_; PhotoTable* _tmp2_; @@ -40378,7 +40478,7 @@ static void library_photo_real_destroy (DataSource* base) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5294 "/home/jens/Source/shotwell/src/Photo.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 40377 "Photo.c" +#line 40477 "Photo.c" goto __catch422_database_error; } #line 5294 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40387,7 +40487,7 @@ static void library_photo_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 5294 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40386 "Photo.c" +#line 40486 "Photo.c" } } goto __finally422; @@ -40405,7 +40505,7 @@ static void library_photo_real_destroy (DataSource* base) { app_window_database_error (_tmp4_); #line 5293 "/home/jens/Source/shotwell/src/Photo.vala" _g_error_free0 (err); -#line 40404 "Photo.c" +#line 40504 "Photo.c" } __finally422: #line 5293 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40416,169 +40516,150 @@ static void library_photo_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 5293 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40415 "Photo.c" +#line 40515 "Photo.c" } #line 5299 "/home/jens/Source/shotwell/src/Photo.vala" DATA_SOURCE_CLASS (library_photo_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource)); -#line 40419 "Photo.c" +#line 40519 "Photo.c" } -gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format) { +gboolean +library_photo_has_nontrash_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format) +{ gboolean result = FALSE; - GFile* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - PhotoFileFormat _tmp3_; - PhotoID _tmp4_ = {0}; - gboolean _tmp5_; + PhotoID _tmp0_ = {0}; #line 5302 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE); #line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = thumbnail_md5; + library_photo_get_nontrash_duplicate (file, thumbnail_md5, full_md5, file_format, &_tmp0_); #line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = full_md5; -#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = file_format; -#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - library_photo_get_nontrash_duplicate (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_); -#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_id_is_valid (&_tmp4_); -#line 5304 "/home/jens/Source/shotwell/src/Photo.vala" - result = _tmp5_; + result = photo_id_is_valid (&_tmp0_); #line 5304 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40449 "Photo.c" +#line 40539 "Photo.c" } -void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, PhotoID* result) { +void +library_photo_get_nontrash_duplicate (GFile* file, + const gchar* thumbnail_md5, + const gchar* full_md5, + PhotoFileFormat file_format, + PhotoID* result) +{ PhotoID* ids = NULL; - GFile* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - PhotoFileFormat _tmp3_; - gint _tmp4_; - PhotoID* _tmp5_; + gint _tmp0_; + PhotoID* _tmp1_; gint ids_length1; gint _ids_size_; - gboolean _tmp6_ = FALSE; - PhotoID* _tmp7_; - gint _tmp7__length1; - PhotoID* _tmp10_; - gint _tmp10__length1; - PhotoID _tmp18_ = {0}; + gboolean _tmp2_ = FALSE; + PhotoID* _tmp3_; + gint _tmp3__length1; + PhotoID* _tmp6_; + gint _tmp6__length1; + PhotoID _tmp13_ = {0}; #line 5307 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((file == NULL) || G_IS_FILE (file)); #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = file; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = thumbnail_md5; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = full_md5; + _tmp1_ = photo_get_duplicate_ids (file, thumbnail_md5, full_md5, file_format, &_tmp0_); #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = file_format; + ids = _tmp1_; #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = photo_get_duplicate_ids (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_); -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - ids = _tmp5_; -#line 5309 "/home/jens/Source/shotwell/src/Photo.vala" - ids_length1 = _tmp4_; + ids_length1 = _tmp0_; #line 5309 "/home/jens/Source/shotwell/src/Photo.vala" _ids_size_ = ids_length1; #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = ids; + _tmp3_ = ids; #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7__length1 = ids_length1; + _tmp3__length1 = ids_length1; #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp7_ == NULL) { + if (_tmp3_ == NULL) { #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = TRUE; -#line 40495 "Photo.c" + _tmp2_ = TRUE; +#line 40579 "Photo.c" } else { - PhotoID* _tmp8_; - gint _tmp8__length1; + PhotoID* _tmp4_; + gint _tmp4__length1; #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = ids; + _tmp4_ = ids; #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8__length1 = ids_length1; + _tmp4__length1 = ids_length1; #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = _tmp8__length1 == 0; -#line 40505 "Photo.c" + _tmp2_ = _tmp4__length1 == 0; +#line 40589 "Photo.c" } #line 5311 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp6_) { -#line 40509 "Photo.c" - PhotoID _tmp9_ = {0}; + if (_tmp2_) { +#line 40593 "Photo.c" + PhotoID _tmp5_ = {0}; #line 5312 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id_init (&_tmp9_, PHOTO_ID_INVALID); + photo_id_init (&_tmp5_, PHOTO_ID_INVALID); #line 5312 "/home/jens/Source/shotwell/src/Photo.vala" - *result = _tmp9_; + *result = _tmp5_; #line 5312 "/home/jens/Source/shotwell/src/Photo.vala" ids = (g_free (ids), NULL); #line 5312 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40519 "Photo.c" +#line 40603 "Photo.c" } #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = ids; + _tmp6_ = ids; #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10__length1 = ids_length1; -#line 40525 "Photo.c" + _tmp6__length1 = ids_length1; +#line 40609 "Photo.c" { PhotoID* id_collection = NULL; gint id_collection_length1 = 0; gint _id_collection_size_ = 0; gint id_it = 0; #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" - id_collection = _tmp10_; + id_collection = _tmp6_; #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" - id_collection_length1 = _tmp10__length1; + id_collection_length1 = _tmp6__length1; #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" - for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) { -#line 40537 "Photo.c" + for (id_it = 0; id_it < _tmp6__length1; id_it = id_it + 1) { +#line 40621 "Photo.c" PhotoID id = {0}; #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" id = id_collection[id_it]; -#line 40541 "Photo.c" +#line 40625 "Photo.c" { LibraryPhoto* photo = NULL; - LibraryPhotoSourceCollection* _tmp11_; - PhotoID _tmp12_; - LibraryPhoto* _tmp13_; - gboolean _tmp14_ = FALSE; - LibraryPhoto* _tmp15_; + LibraryPhotoSourceCollection* _tmp7_; + PhotoID _tmp8_; + LibraryPhoto* _tmp9_; + gboolean _tmp10_ = FALSE; + LibraryPhoto* _tmp11_; #line 5315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = library_photo_global; + _tmp7_ = library_photo_global; #line 5315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = id; + _tmp8_ = id; #line 5315 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = library_photo_source_collection_fetch (_tmp11_, &_tmp12_); + _tmp9_ = library_photo_source_collection_fetch (_tmp7_, &_tmp8_); #line 5315 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp13_; + photo = _tmp9_; #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo; -#line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_ != NULL) { -#line 40561 "Photo.c" - LibraryPhoto* _tmp16_; - gboolean _tmp17_; + _tmp11_ = photo; #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = photo; + if (_tmp11_ != NULL) { +#line 40645 "Photo.c" + LibraryPhoto* _tmp12_; #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp12_ = photo; #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = !_tmp17_; -#line 40570 "Photo.c" + _tmp10_ = !media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource)); +#line 40651 "Photo.c" } else { #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = FALSE; -#line 40574 "Photo.c" + _tmp10_ = FALSE; +#line 40655 "Photo.c" } #line 5316 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp14_) { + if (_tmp10_) { #line 5317 "/home/jens/Source/shotwell/src/Photo.vala" *result = id; #line 5317 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40587,27 +40668,29 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m ids = (g_free (ids), NULL); #line 5317 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40586 "Photo.c" +#line 40667 "Photo.c" } #line 5314 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 40590 "Photo.c" +#line 40671 "Photo.c" } } } #line 5320 "/home/jens/Source/shotwell/src/Photo.vala" - photo_id_init (&_tmp18_, PHOTO_ID_INVALID); + photo_id_init (&_tmp13_, PHOTO_ID_INVALID); #line 5320 "/home/jens/Source/shotwell/src/Photo.vala" - *result = _tmp18_; + *result = _tmp13_; #line 5320 "/home/jens/Source/shotwell/src/Photo.vala" ids = (g_free (ids), NULL); #line 5320 "/home/jens/Source/shotwell/src/Photo.vala" return; -#line 40602 "Photo.c" +#line 40683 "Photo.c" } -static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { +static gboolean +library_photo_real_has_user_generated_metadata (Photo* base) +{ LibraryPhoto * self; gboolean result = FALSE; GeeList* tags = NULL; @@ -40616,22 +40699,20 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { PhotoMetadata* metadata = NULL; PhotoMetadata* _tmp2_; PhotoMetadata* _tmp3_; - Rating _tmp11_; - PhotoMetadata* _tmp12_; - Rating _tmp13_; + PhotoMetadata* _tmp10_; GeeSet* keywords = NULL; - PhotoMetadata* _tmp14_; - GeeSet* _tmp15_; - gint _tmp16_ = 0; - GeeList* _tmp17_; + PhotoMetadata* _tmp11_; + GeeSet* _tmp12_; + gint _tmp13_ = 0; + GeeList* _tmp14_; gint tags_count = 0; - gint _tmp21_ = 0; - GeeSet* _tmp22_; + gint _tmp18_ = 0; + GeeSet* _tmp19_; gint keywords_count = 0; - gint _tmp26_; - gint _tmp27_; - gboolean _tmp28_ = FALSE; - GeeList* _tmp29_; + gint _tmp23_; + gint _tmp24_; + gboolean _tmp25_ = FALSE; + GeeList* _tmp26_; #line 5323 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5324 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40648,7 +40729,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _tmp3_ = metadata; #line 5327 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp3_ == NULL) { -#line 40647 "Photo.c" +#line 40728 "Photo.c" gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; GeeList* _tmp6_; @@ -40658,7 +40739,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { if (_tmp6_ != NULL) { #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = TRUE; -#line 40657 "Photo.c" +#line 40738 "Photo.c" } else { GeeList* _tmp7_; gint _tmp8_; @@ -40671,20 +40752,17 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _tmp9_ = _tmp8_; #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp5_ = _tmp9_ > 0; -#line 40670 "Photo.c" +#line 40751 "Photo.c" } #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp5_) { #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" _tmp4_ = TRUE; -#line 40676 "Photo.c" +#line 40757 "Photo.c" } else { - Rating _tmp10_; -#line 5328 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp10_ != RATING_UNRATED; -#line 40683 "Photo.c" + _tmp4_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_UNRATED; +#line 40761 "Photo.c" } #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" result = _tmp4_; @@ -40694,16 +40772,12 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5328 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40693 "Photo.c" +#line 40771 "Photo.c" } #line 5330 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5330 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = metadata; -#line 5330 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = photo_metadata_get_rating (_tmp12_); + _tmp10_ = metadata; #line 5330 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp11_ != _tmp13_) { + if (media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)) != photo_metadata_get_rating (_tmp10_)) { #line 5331 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 5331 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40712,68 +40786,68 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5331 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40711 "Photo.c" +#line 40785 "Photo.c" } #line 5333 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = metadata; + _tmp11_ = metadata; #line 5333 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_metadata_get_keywords (_tmp14_, NULL, NULL, NULL); + _tmp12_ = photo_metadata_get_keywords (_tmp11_, NULL, NULL, NULL); #line 5333 "/home/jens/Source/shotwell/src/Photo.vala" - keywords = _tmp15_; + keywords = _tmp12_; #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = tags; + _tmp14_ = tags; #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp17_ != NULL) { -#line 40723 "Photo.c" - GeeList* _tmp18_; - gint _tmp19_; - gint _tmp20_; + if (_tmp14_ != NULL) { +#line 40797 "Photo.c" + GeeList* _tmp15_; + gint _tmp16_; + gint _tmp17_; #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = tags; + _tmp15_ = tags; #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp20_; -#line 40735 "Photo.c" + _tmp13_ = _tmp17_; +#line 40809 "Photo.c" } else { #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = 0; -#line 40739 "Photo.c" + _tmp13_ = 0; +#line 40813 "Photo.c" } #line 5334 "/home/jens/Source/shotwell/src/Photo.vala" - tags_count = _tmp16_; + tags_count = _tmp13_; #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = keywords; + _tmp19_ = keywords; #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_ != NULL) { -#line 40747 "Photo.c" - GeeSet* _tmp23_; - gint _tmp24_; - gint _tmp25_; + if (_tmp19_ != NULL) { +#line 40821 "Photo.c" + GeeSet* _tmp20_; + gint _tmp21_; + gint _tmp22_; #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = keywords; + _tmp20_ = keywords; #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _tmp24_; + _tmp22_ = _tmp21_; #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = _tmp25_; -#line 40759 "Photo.c" + _tmp18_ = _tmp22_; +#line 40833 "Photo.c" } else { #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = 0; -#line 40763 "Photo.c" + _tmp18_ = 0; +#line 40837 "Photo.c" } #line 5335 "/home/jens/Source/shotwell/src/Photo.vala" - keywords_count = _tmp21_; + keywords_count = _tmp18_; #line 5337 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = tags_count; + _tmp23_ = tags_count; #line 5337 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = keywords_count; + _tmp24_ = keywords_count; #line 5337 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp26_ != _tmp27_) { + if (_tmp23_ != _tmp24_) { #line 5338 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 5338 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40784,114 +40858,111 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5338 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40783 "Photo.c" +#line 40857 "Photo.c" } #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = tags; + _tmp26_ = tags; #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp29_ != NULL) { -#line 40789 "Photo.c" - GeeSet* _tmp30_; + if (_tmp26_ != NULL) { +#line 40863 "Photo.c" + GeeSet* _tmp27_; #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = keywords; + _tmp27_ = keywords; #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _tmp30_ != NULL; -#line 40795 "Photo.c" + _tmp25_ = _tmp27_ != NULL; +#line 40869 "Photo.c" } else { #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = FALSE; -#line 40799 "Photo.c" + _tmp25_ = FALSE; +#line 40873 "Photo.c" } #line 5340 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp28_) { -#line 40803 "Photo.c" + if (_tmp25_) { +#line 40877 "Photo.c" { GeeList* _tag_list = NULL; - GeeList* _tmp31_; - GeeList* _tmp32_; + GeeList* _tmp28_; + GeeList* _tmp29_; gint _tag_size = 0; - GeeList* _tmp33_; - gint _tmp34_; - gint _tmp35_; + GeeList* _tmp30_; + gint _tmp31_; + gint _tmp32_; gint _tag_index = 0; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = tags; + _tmp28_ = tags; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = _g_object_ref0 (_tmp31_); + _tmp29_ = _g_object_ref0 (_tmp28_); #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tag_list = _tmp32_; + _tag_list = _tmp29_; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = _tag_list; + _tmp30_ = _tag_list; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp31_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection)); #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_; + _tmp32_ = _tmp31_; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tag_size = _tmp35_; + _tag_size = _tmp32_; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _tag_index = -1; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40831 "Photo.c" - gint _tmp36_; - gint _tmp37_; - gint _tmp38_; +#line 40905 "Photo.c" + gint _tmp33_; + gint _tmp34_; + gint _tmp35_; Tag* tag = NULL; - GeeList* _tmp39_; - gint _tmp40_; - gpointer _tmp41_; - GeeSet* _tmp42_; - Tag* _tmp43_; + GeeList* _tmp36_; + gint _tmp37_; + gpointer _tmp38_; + GeeSet* _tmp39_; + Tag* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; gchar* _tmp44_; - gchar* _tmp45_; - gchar* _tmp46_; - gchar* _tmp47_; - gboolean _tmp48_; - gboolean _tmp49_; + gboolean _tmp45_; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = _tag_index; + _tmp33_ = _tag_index; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tag_index = _tmp36_ + 1; + _tag_index = _tmp33_ + 1; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = _tag_index; + _tmp34_ = _tag_index; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tag_size; + _tmp35_ = _tag_size; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - if (!(_tmp37_ < _tmp38_)) { + if (!(_tmp34_ < _tmp35_)) { #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 40859 "Photo.c" +#line 40932 "Photo.c" } #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = _tag_list; + _tmp36_ = _tag_list; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = _tag_index; + _tmp37_ = _tag_index; #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = gee_list_get (_tmp39_, _tmp40_); + _tmp38_ = gee_list_get (_tmp36_, _tmp37_); #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" - tag = (Tag*) _tmp41_; -#line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = keywords; + tag = (Tag*) _tmp38_; #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = tag; + _tmp39_ = keywords; #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_OBJECT, DataObject)); + _tmp40_ = tag; #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _tmp44_; + _tmp41_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_OBJECT, DataObject)); #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = g_utf8_normalize (_tmp45_, (gssize) -1, G_NORMALIZE_DEFAULT); + _tmp42_ = _tmp41_; #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _tmp46_; + _tmp43_ = g_utf8_normalize (_tmp42_, (gssize) -1, G_NORMALIZE_DEFAULT); #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection), _tmp47_); + _tmp44_ = _tmp43_; #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = !_tmp48_; + _tmp45_ = !gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), _tmp44_); #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp47_); + _g_free0 (_tmp44_); #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - _g_free0 (_tmp45_); + _g_free0 (_tmp42_); #line 5342 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp49_) { + if (_tmp45_) { #line 5343 "/home/jens/Source/shotwell/src/Photo.vala" result = TRUE; #line 5343 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40906,15 +40977,15 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5343 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40905 "Photo.c" +#line 40976 "Photo.c" } #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 40909 "Photo.c" +#line 40980 "Photo.c" } #line 5341 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_list); -#line 40913 "Photo.c" +#line 40984 "Photo.c" } } #line 5347 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40927,18 +40998,19 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) { _g_object_unref0 (tags); #line 5347 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 40926 "Photo.c" +#line 40997 "Photo.c" } -static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoMetadata* metadata) { +static void +library_photo_real_set_user_metadata_for_export (Photo* base, + PhotoMetadata* metadata) +{ LibraryPhoto * self; GeeList* photo_tags = NULL; TagSourceCollection* _tmp0_; GeeList* _tmp1_; GeeList* _tmp2_; - PhotoMetadata* _tmp22_; - Rating _tmp23_; #line 5350 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5350 "/home/jens/Source/shotwell/src/Photo.vala" @@ -40953,16 +41025,15 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM _tmp2_ = photo_tags; #line 5352 "/home/jens/Source/shotwell/src/Photo.vala" if (_tmp2_ != NULL) { -#line 40952 "Photo.c" +#line 41024 "Photo.c" GeeCollection* string_tags = NULL; GeeArrayList* _tmp3_; - PhotoMetadata* _tmp19_; - GeeCollection* _tmp20_; + GeeCollection* _tmp19_; #line 5353 "/home/jens/Source/shotwell/src/Photo.vala" _tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 5353 "/home/jens/Source/shotwell/src/Photo.vala" string_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 40961 "Photo.c" +#line 41032 "Photo.c" { GeeList* _tag_list = NULL; GeeList* _tmp4_; @@ -40990,7 +41061,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM _tag_index = -1; #line 5354 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 40989 "Photo.c" +#line 41060 "Photo.c" gint _tmp9_; gint _tmp10_; gint _tmp11_; @@ -41014,7 +41085,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM if (!(_tmp10_ < _tmp11_)) { #line 5354 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41013 "Photo.c" +#line 41084 "Photo.c" } #line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _tmp12_ = _tag_list; @@ -41038,51 +41109,42 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM _g_free0 (_tmp18_); #line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (tag); -#line 41037 "Photo.c" +#line 41108 "Photo.c" } #line 5354 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_tag_list); -#line 41041 "Photo.c" +#line 41112 "Photo.c" } #line 5357 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = metadata; -#line 5357 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = string_tags; + _tmp19_ = string_tags; #line 5357 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_keywords (_tmp19_, _tmp20_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); + photo_metadata_set_keywords (metadata, _tmp19_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 5352 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (string_tags); -#line 41051 "Photo.c" +#line 41120 "Photo.c" } else { - PhotoMetadata* _tmp21_; #line 5359 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = metadata; -#line 5359 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_keywords (_tmp21_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); -#line 41058 "Photo.c" + photo_metadata_set_keywords (metadata, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); +#line 41124 "Photo.c" } #line 5361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = metadata; -#line 5361 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); -#line 5361 "/home/jens/Source/shotwell/src/Photo.vala" - photo_metadata_set_rating (_tmp22_, _tmp23_); + photo_metadata_set_rating (metadata, media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource))); #line 5350 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo_tags); -#line 41068 "Photo.c" +#line 41130 "Photo.c" } -static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, PhotoMetadata* metadata) { +static void +library_photo_real_apply_user_metadata_for_reimport (Photo* base, + PhotoMetadata* metadata) +{ LibraryPhoto * self; HierarchicalTagIndex* new_htag_index = NULL; - PhotoMetadata* _tmp0_; - gboolean _tmp1_; GeeCollection* keywords = NULL; - PhotoMetadata* _tmp6_; - GeeSet* _tmp7_; - GeeCollection* _tmp8_; - HierarchicalTagIndex* _tmp39_; + GeeSet* _tmp3_; + GeeCollection* _tmp4_; + HierarchicalTagIndex* _tmp31_; #line 5364 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto); #line 5364 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41090,158 +41152,139 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph #line 5365 "/home/jens/Source/shotwell/src/Photo.vala" new_htag_index = NULL; #line 5367 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = metadata; -#line 5367 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = photo_metadata_has_hierarchical_keywords (_tmp0_); -#line 5367 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp1_) { -#line 41094 "Photo.c" - PhotoMetadata* _tmp2_; - GeeSet* _tmp3_; - GeeSet* _tmp4_; - HierarchicalTagIndex* _tmp5_; -#line 5368 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = metadata; + if (photo_metadata_has_hierarchical_keywords (metadata)) { +#line 41152 "Photo.c" + GeeSet* _tmp0_; + GeeSet* _tmp1_; + HierarchicalTagIndex* _tmp2_; #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = photo_metadata_get_hierarchical_keywords (_tmp2_); + _tmp0_ = photo_metadata_get_hierarchical_keywords (metadata); #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = _tmp3_; + _tmp1_ = _tmp0_; #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (new_htag_index); #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" - new_htag_index = _tmp5_; + new_htag_index = _tmp2_; #line 5368 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp4_); -#line 41113 "Photo.c" + _g_object_unref0 (_tmp1_); +#line 41168 "Photo.c" } #line 5372 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = metadata; + _tmp3_ = photo_metadata_get_keywords (metadata, NULL, NULL, NULL); #line 5372 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo_metadata_get_keywords (_tmp6_, NULL, NULL, NULL); -#line 5372 "/home/jens/Source/shotwell/src/Photo.vala" - keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection); + keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); #line 5373 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = keywords; + _tmp4_ = keywords; #line 5373 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp8_ != NULL) { -#line 41125 "Photo.c" + if (_tmp4_ != NULL) { +#line 41178 "Photo.c" { GeeIterator* _keyword_it = NULL; - GeeCollection* _tmp9_; - GeeIterator* _tmp10_; + GeeCollection* _tmp5_; + GeeIterator* _tmp6_; #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = keywords; + _tmp5_ = keywords; #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _keyword_it = _tmp10_; + _keyword_it = _tmp6_; #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41138 "Photo.c" - GeeIterator* _tmp11_; - gboolean _tmp12_; +#line 41191 "Photo.c" + GeeIterator* _tmp7_; gchar* keyword = NULL; - GeeIterator* _tmp13_; - gpointer _tmp14_; - gboolean _tmp15_ = FALSE; - HierarchicalTagIndex* _tmp16_; + GeeIterator* _tmp8_; + gpointer _tmp9_; + gboolean _tmp10_ = FALSE; + HierarchicalTagIndex* _tmp11_; gchar* safe_keyword = NULL; - const gchar* _tmp20_; - gchar* _tmp21_; + const gchar* _tmp14_; + gchar* _tmp15_; gchar* promoted_keyword = NULL; - const gchar* _tmp22_; - gchar* _tmp23_; - TagSourceCollection* _tmp24_; - const gchar* _tmp25_; - gboolean _tmp26_; - TagSourceCollection* _tmp30_; - const gchar* _tmp31_; - gboolean _tmp32_; - const gchar* _tmp36_; - Tag* _tmp37_; - Tag* _tmp38_; -#line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _keyword_it; + const gchar* _tmp16_; + gchar* _tmp17_; + TagSourceCollection* _tmp18_; + const gchar* _tmp19_; + TagSourceCollection* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp28_; + Tag* _tmp29_; + Tag* _tmp30_; #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = gee_iterator_next (_tmp11_); + _tmp7_ = _keyword_it; #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp12_) { + if (!gee_iterator_next (_tmp7_)) { #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41169 "Photo.c" +#line 41217 "Photo.c" } #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = _keyword_it; + _tmp8_ = _keyword_it; #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = gee_iterator_get (_tmp13_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" - keyword = (gchar*) _tmp14_; + keyword = (gchar*) _tmp9_; #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = new_htag_index; + _tmp11_ = new_htag_index; #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp16_ != NULL) { -#line 41181 "Photo.c" - HierarchicalTagIndex* _tmp17_; - const gchar* _tmp18_; - gboolean _tmp19_; -#line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = new_htag_index; + if (_tmp11_ != NULL) { +#line 41229 "Photo.c" + HierarchicalTagIndex* _tmp12_; + const gchar* _tmp13_; #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = keyword; + _tmp12_ = new_htag_index; #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = hierarchical_tag_index_is_tag_in_index (_tmp17_, _tmp18_); + _tmp13_ = keyword; #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = _tmp19_; -#line 41193 "Photo.c" + _tmp10_ = hierarchical_tag_index_is_tag_in_index (_tmp12_, _tmp13_); +#line 41238 "Photo.c" } else { #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = FALSE; -#line 41197 "Photo.c" + _tmp10_ = FALSE; +#line 41242 "Photo.c" } #line 5375 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp15_) { + if (_tmp10_) { #line 5376 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); #line 5376 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41205 "Photo.c" +#line 41250 "Photo.c" } #line 5378 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = keyword; + _tmp14_ = keyword; #line 5378 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp20_); + _tmp15_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp14_); #line 5378 "/home/jens/Source/shotwell/src/Photo.vala" - safe_keyword = _tmp21_; + safe_keyword = _tmp15_; #line 5379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = safe_keyword; + _tmp16_ = safe_keyword; #line 5379 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp22_); + _tmp17_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp16_); #line 5379 "/home/jens/Source/shotwell/src/Photo.vala" - promoted_keyword = _tmp23_; + promoted_keyword = _tmp17_; #line 5382 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = tag_global; + _tmp18_ = tag_global; #line 5382 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = safe_keyword; + _tmp19_ = safe_keyword; #line 5382 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = tag_source_collection_exists (_tmp24_, _tmp25_, FALSE); -#line 5382 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp26_) { -#line 41227 "Photo.c" - const gchar* _tmp27_; - Tag* _tmp28_; - Tag* _tmp29_; + if (tag_source_collection_exists (_tmp18_, _tmp19_, FALSE)) { +#line 41270 "Photo.c" + const gchar* _tmp20_; + Tag* _tmp21_; + Tag* _tmp22_; #line 5383 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = safe_keyword; + _tmp20_ = safe_keyword; #line 5383 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = tag_for_path (_tmp27_); + _tmp21_ = tag_for_path (_tmp20_); #line 5383 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = _tmp28_; + _tmp22_ = _tmp21_; #line 5383 "/home/jens/Source/shotwell/src/Photo.vala" - tag_attach (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + tag_attach (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 5383 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp29_); + _g_object_unref0 (_tmp22_); #line 5384 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (promoted_keyword); #line 5384 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41250,30 +41293,28 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _g_free0 (keyword); #line 5384 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41249 "Photo.c" +#line 41292 "Photo.c" } #line 5387 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = tag_global; -#line 5387 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = promoted_keyword; + _tmp23_ = tag_global; #line 5387 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = tag_source_collection_exists (_tmp30_, _tmp31_, FALSE); + _tmp24_ = promoted_keyword; #line 5387 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp32_) { -#line 41259 "Photo.c" - const gchar* _tmp33_; - Tag* _tmp34_; - Tag* _tmp35_; + if (tag_source_collection_exists (_tmp23_, _tmp24_, FALSE)) { +#line 41300 "Photo.c" + const gchar* _tmp25_; + Tag* _tmp26_; + Tag* _tmp27_; #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = promoted_keyword; + _tmp25_ = promoted_keyword; #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = tag_for_path (_tmp33_); + _tmp26_ = tag_for_path (_tmp25_); #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = _tmp34_; + _tmp27_ = _tmp26_; #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" - tag_attach (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + tag_attach (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp35_); + _g_object_unref0 (_tmp27_); #line 5389 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (promoted_keyword); #line 5389 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41282,112 +41323,111 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph _g_free0 (keyword); #line 5389 "/home/jens/Source/shotwell/src/Photo.vala" continue; -#line 41281 "Photo.c" +#line 41322 "Photo.c" } #line 5392 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = keyword; + _tmp28_ = keyword; #line 5392 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = tag_for_path (_tmp36_); + _tmp29_ = tag_for_path (_tmp28_); #line 5392 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = _tmp37_; + _tmp30_ = _tmp29_; #line 5392 "/home/jens/Source/shotwell/src/Photo.vala" - tag_attach (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + tag_attach (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 5392 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp38_); + _g_object_unref0 (_tmp30_); #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (promoted_keyword); #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (safe_keyword); #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (keyword); -#line 41299 "Photo.c" +#line 41340 "Photo.c" } #line 5374 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_keyword_it); -#line 41303 "Photo.c" +#line 41344 "Photo.c" } } #line 5396 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = new_htag_index; + _tmp31_ = new_htag_index; #line 5396 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp39_ != NULL) { -#line 41310 "Photo.c" + if (_tmp31_ != NULL) { +#line 41351 "Photo.c" { GeeIterator* _path_it = NULL; - HierarchicalTagIndex* _tmp40_; - GeeCollection* _tmp41_; - GeeCollection* _tmp42_; - GeeIterator* _tmp43_; - GeeIterator* _tmp44_; + HierarchicalTagIndex* _tmp32_; + GeeCollection* _tmp33_; + GeeCollection* _tmp34_; + GeeIterator* _tmp35_; + GeeIterator* _tmp36_; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = new_htag_index; + _tmp32_ = new_htag_index; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = hierarchical_tag_index_get_all_paths (_tmp40_); + _tmp33_ = hierarchical_tag_index_get_all_paths (_tmp32_); #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = _tmp41_; + _tmp34_ = _tmp33_; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp35_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = _tmp43_; + _tmp36_ = _tmp35_; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp42_); + _g_object_unref0 (_tmp34_); #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _path_it = _tmp44_; + _path_it = _tmp36_; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41334 "Photo.c" - GeeIterator* _tmp45_; - gboolean _tmp46_; +#line 41375 "Photo.c" + GeeIterator* _tmp37_; gchar* path = NULL; - GeeIterator* _tmp47_; - gpointer _tmp48_; - const gchar* _tmp49_; - Tag* _tmp50_; - Tag* _tmp51_; -#line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _path_it; + GeeIterator* _tmp38_; + gpointer _tmp39_; + const gchar* _tmp40_; + Tag* _tmp41_; + Tag* _tmp42_; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = gee_iterator_next (_tmp45_); + _tmp37_ = _path_it; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp46_) { + if (!gee_iterator_next (_tmp37_)) { #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41351 "Photo.c" +#line 41389 "Photo.c" } #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = _path_it; + _tmp38_ = _path_it; #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = gee_iterator_get (_tmp47_); + _tmp39_ = gee_iterator_get (_tmp38_); #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" - path = (gchar*) _tmp48_; + path = (gchar*) _tmp39_; #line 5398 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = path; + _tmp40_ = path; #line 5398 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = tag_for_path (_tmp49_); + _tmp41_ = tag_for_path (_tmp40_); #line 5398 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = _tmp50_; + _tmp42_ = _tmp41_; #line 5398 "/home/jens/Source/shotwell/src/Photo.vala" - tag_attach (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); + tag_attach (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource)); #line 5398 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp51_); + _g_object_unref0 (_tmp42_); #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _g_free0 (path); -#line 41371 "Photo.c" +#line 41409 "Photo.c" } #line 5397 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_path_it); -#line 41375 "Photo.c" +#line 41413 "Photo.c" } } #line 5364 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (keywords); #line 5364 "/home/jens/Source/shotwell/src/Photo.vala" _hierarchical_tag_index_unref0 (new_htag_index); -#line 41382 "Photo.c" +#line 41420 "Photo.c" } -static void library_photo_class_init (LibraryPhotoClass * klass) { +static void +library_photo_class_init (LibraryPhotoClass * klass) +{ #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_parent_class = g_type_class_peek_parent (klass); #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41432,11 +41472,13 @@ static void library_photo_class_init (LibraryPhotoClass * klass) { ((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_apply_user_metadata_for_reimport; #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (klass)->finalize = library_photo_finalize; -#line 41431 "Photo.c" +#line 41471 "Photo.c" } -static void library_photo_flaggable_interface_init (FlaggableIface * iface) { +static void +library_photo_flaggable_interface_init (FlaggableIface * iface) +{ #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_flaggable_parent_iface = g_type_interface_peek_parent (iface); #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41445,11 +41487,13 @@ static void library_photo_flaggable_interface_init (FlaggableIface * iface) { iface->mark_flagged = (void (*) (Flaggable *)) library_photo_real_mark_flagged; #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" iface->mark_unflagged = (void (*) (Flaggable *)) library_photo_real_mark_unflagged; -#line 41444 "Photo.c" +#line 41486 "Photo.c" } -static void library_photo_monitorable_interface_init (MonitorableIface * iface) { +static void +library_photo_monitorable_interface_init (MonitorableIface * iface) +{ #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_monitorable_parent_iface = g_type_interface_peek_parent (iface); #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41462,22 +41506,26 @@ static void library_photo_monitorable_interface_init (MonitorableIface * iface) iface->set_master_file = (void (*) (Monitorable *, GFile*)) photo_set_master_file; #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" iface->set_master_timestamp = (void (*) (Monitorable *, GFileInfo*)) photo_set_master_timestamp; -#line 41461 "Photo.c" +#line 41505 "Photo.c" } -static void library_photo_instance_init (LibraryPhoto * self) { +static void +library_photo_instance_init (LibraryPhoto * self) +{ #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = LIBRARY_PHOTO_GET_PRIVATE (self); #line 4976 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->block_thumbnail_generation = FALSE; #line 4977 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->thumbnail_scheduler = NULL; -#line 41472 "Photo.c" +#line 41518 "Photo.c" } -static void library_photo_finalize (GObject * obj) { +static void +library_photo_finalize (GObject * obj) +{ LibraryPhoto * self; #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO, LibraryPhoto); @@ -41487,11 +41535,13 @@ static void library_photo_finalize (GObject * obj) { _g_object_unref0 (self->priv->import_keywords); #line 4965 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (library_photo_parent_class)->finalize (obj); -#line 41486 "Photo.c" +#line 41534 "Photo.c" } -GType library_photo_get_type (void) { +GType +library_photo_get_type (void) +{ static volatile gsize library_photo_type_id__volatile = 0; if (g_once_init_enter (&library_photo_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotoClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photo_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhoto), 0, (GInstanceInitFunc) library_photo_instance_init, NULL }; @@ -41507,50 +41557,49 @@ GType library_photo_get_type (void) { } -LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GType object_type, LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { +LibraryPhotoSourceHoldingTank* +library_photo_source_holding_tank_construct (GType object_type, + LibraryPhotoSourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target) +{ LibraryPhotoSourceHoldingTank* self = NULL; - LibraryPhotoSourceCollection* _tmp0_; - SourceHoldingTankCheckToKeep _tmp1_; - void* _tmp1__target; - GetSourceDatabaseKey _tmp2_; - void* _tmp2__target; #line 5414 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (sources), NULL); #line 5416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = sources; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = check_to_keep; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1__target = check_to_keep_target; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = get_key; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2__target = get_key_target; -#line 5416 "/home/jens/Source/shotwell/src/Photo.vala" - self = (LibraryPhotoSourceHoldingTank*) media_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target); + self = (LibraryPhotoSourceHoldingTank*) media_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), check_to_keep, check_to_keep_target, get_key, get_key_target); #line 5414 "/home/jens/Source/shotwell/src/Photo.vala" return self; -#line 41529 "Photo.c" +#line 41571 "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) { +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 5414 "/home/jens/Source/shotwell/src/Photo.vala" return library_photo_source_holding_tank_construct (TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target); -#line 41536 "Photo.c" +#line 41584 "Photo.c" } -LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPhotoSourceHoldingTank* self, GFile* file) { +LibraryPhoto* +library_photo_source_holding_tank_fetch_by_backing_file (LibraryPhotoSourceHoldingTank* self, + GFile* file) +{ LibraryPhoto* result = NULL; LibraryPhoto* ret = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; - LibraryPhoto* _tmp3_; - GeeHashMap* _tmp4_; - GFile* _tmp5_; - gpointer _tmp6_; + gpointer _tmp1_; + LibraryPhoto* _tmp2_; + GeeHashMap* _tmp3_; + gpointer _tmp4_; #line 5419 "/home/jens/Source/shotwell/src/Photo.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self), NULL); #line 5419 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41560,59 +41609,63 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh #line 5421 "/home/jens/Source/shotwell/src/Photo.vala" _tmp0_ = self->priv->editable_file_map; #line 5421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = file; -#line 5421 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 5421 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (ret); #line 5421 "/home/jens/Source/shotwell/src/Photo.vala" - ret = (LibraryPhoto*) _tmp2_; + ret = (LibraryPhoto*) _tmp1_; #line 5422 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = ret; + _tmp2_ = ret; #line 5422 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp3_ != NULL) { + if (_tmp2_ != NULL) { #line 5423 "/home/jens/Source/shotwell/src/Photo.vala" result = ret; #line 5423 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 41574 "Photo.c" +#line 41621 "Photo.c" } #line 5425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->development_file_map; -#line 5425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = file; + _tmp3_ = self->priv->development_file_map; #line 5425 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 5425 "/home/jens/Source/shotwell/src/Photo.vala" - result = (LibraryPhoto*) _tmp6_; + result = (LibraryPhoto*) _tmp4_; #line 5425 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (ret); #line 5425 "/home/jens/Source/shotwell/src/Photo.vala" return result; -#line 41588 "Photo.c" +#line 41633 "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) { +static void +_library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced (Photo* _sender, + GFile* old_file, + GFile* new_file, + gpointer self) +{ #line 5449 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_on_editable_replaced ((LibraryPhotoSourceHoldingTank*) self, _sender, old_file, new_file); -#line 41595 "Photo.c" +#line 41645 "Photo.c" } -static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) { +static void +_library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, + gpointer self) +{ #line 5450 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_on_raw_development_modified ((LibraryPhotoSourceHoldingTank*) self, _sender); -#line 41602 "Photo.c" +#line 41655 "Photo.c" } -static void library_photo_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed) { +static void +library_photo_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, + GeeCollection* added, + GeeCollection* removed) +{ LibraryPhotoSourceHoldingTank * self; - GeeCollection* _tmp0_; - GeeCollection* _tmp40_; - GeeCollection* _tmp81_; - GeeCollection* _tmp82_; #line 5428 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); #line 5428 "/home/jens/Source/shotwell/src/Photo.vala" @@ -41620,453 +41673,425 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour #line 5428 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 5430 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = added; -#line 5430 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp0_ != NULL) { -#line 41622 "Photo.c" + if (added != NULL) { +#line 41673 "Photo.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = added; + GeeIterator* _tmp0_; #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable)); #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _source_it = _tmp2_; + _source_it = _tmp0_; #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41635 "Photo.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 41683 "Photo.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; LibraryPhoto* photo = NULL; - DataSource* _tmp7_; - LibraryPhoto* _tmp8_; - LibraryPhoto* _tmp9_; - GFile* _tmp10_; - GFile* _tmp11_; - gboolean _tmp12_; + DataSource* _tmp4_; + LibraryPhoto* _tmp5_; + LibraryPhoto* _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; + gboolean _tmp9_; GeeCollection* raw_files = NULL; - LibraryPhoto* _tmp23_; - GeeCollection* _tmp24_; - GeeCollection* _tmp25_; - LibraryPhoto* _tmp38_; - LibraryPhoto* _tmp39_; -#line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = _source_it; + LibraryPhoto* _tmp20_; + GeeCollection* _tmp21_; + GeeCollection* _tmp22_; + LibraryPhoto* _tmp34_; + LibraryPhoto* _tmp35_; #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp1_ = _source_it; #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41662 "Photo.c" +#line 41707 "Photo.c" } #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = _source_it; + _tmp2_ = _source_it; #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" - source = (DataSource*) _tmp6_; + source = (DataSource*) _tmp3_; #line 5432 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = source; + _tmp4_ = source; #line 5432 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 5432 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp8_; + photo = _tmp5_; #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = photo; + _tmp6_ = photo; #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo)); + _tmp7_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _tmp11_ != NULL; + _tmp9_ = _tmp8_ != NULL; #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp8_); #line 5435 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp12_) { -#line 41688 "Photo.c" - GeeHashMap* _tmp13_; + if (_tmp9_) { +#line 41733 "Photo.c" + GeeHashMap* _tmp10_; + LibraryPhoto* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; LibraryPhoto* _tmp14_; - GFile* _tmp15_; - GFile* _tmp16_; + GeeMultiMap* _tmp15_; + LibraryPhoto* _tmp16_; LibraryPhoto* _tmp17_; - GeeMultiMap* _tmp18_; - LibraryPhoto* _tmp19_; - LibraryPhoto* _tmp20_; - GFile* _tmp21_; - GFile* _tmp22_; + GFile* _tmp18_; + GFile* _tmp19_; #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->priv->editable_file_map; + _tmp10_ = self->priv->editable_file_map; #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo; + _tmp11_ = photo; #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo)); + _tmp12_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo)); #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = _tmp15_; + _tmp13_ = _tmp12_; #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = photo; + _tmp14_ = photo; #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, _tmp17_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp14_); #line 5436 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp13_); #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->priv->reverse_editable_file_map; + _tmp15_ = self->priv->reverse_editable_file_map; #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = photo; + _tmp16_ = photo; #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = photo; + _tmp17_ = photo; #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); + _tmp18_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo)); #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = _tmp21_; + _tmp19_ = _tmp18_; #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp18_, _tmp19_, _tmp22_); + gee_multi_map_set (_tmp15_, _tmp16_, _tmp19_); #line 5437 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp22_); -#line 41727 "Photo.c" + _g_object_unref0 (_tmp19_); +#line 41772 "Photo.c" } #line 5441 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = photo; + _tmp20_ = photo; #line 5441 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo)); + _tmp21_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); #line 5441 "/home/jens/Source/shotwell/src/Photo.vala" - raw_files = _tmp24_; + raw_files = _tmp21_; #line 5442 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = raw_files; + _tmp22_ = raw_files; #line 5442 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp25_ != NULL) { -#line 41739 "Photo.c" + if (_tmp22_ != NULL) { +#line 41784 "Photo.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp26_; - GeeIterator* _tmp27_; + GeeCollection* _tmp23_; + GeeIterator* _tmp24_; #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = raw_files; + _tmp23_ = raw_files; #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp27_; + _f_it = _tmp24_; #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41752 "Photo.c" - GeeIterator* _tmp28_; - gboolean _tmp29_; +#line 41797 "Photo.c" + GeeIterator* _tmp25_; GFile* f = NULL; - GeeIterator* _tmp30_; - gpointer _tmp31_; - GeeHashMap* _tmp32_; + GeeIterator* _tmp26_; + gpointer _tmp27_; + GeeHashMap* _tmp28_; + GFile* _tmp29_; + LibraryPhoto* _tmp30_; + GeeMultiMap* _tmp31_; + LibraryPhoto* _tmp32_; GFile* _tmp33_; - LibraryPhoto* _tmp34_; - GeeMultiMap* _tmp35_; - LibraryPhoto* _tmp36_; - GFile* _tmp37_; #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = _f_it; + _tmp25_ = _f_it; #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = gee_iterator_next (_tmp28_); -#line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp29_) { + if (!gee_iterator_next (_tmp25_)) { #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41772 "Photo.c" +#line 41814 "Photo.c" } #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = _f_it; + _tmp26_ = _f_it; #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = gee_iterator_get (_tmp30_); + _tmp27_ = gee_iterator_get (_tmp26_); #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp31_; + f = (GFile*) _tmp27_; #line 5444 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->priv->development_file_map; + _tmp28_ = self->priv->development_file_map; #line 5444 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = f; + _tmp29_ = f; #line 5444 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = photo; + _tmp30_ = photo; #line 5444 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, _tmp30_); #line 5445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp35_ = self->priv->reverse_development_file_map; + _tmp31_ = self->priv->reverse_development_file_map; #line 5445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp36_ = photo; + _tmp32_ = photo; #line 5445 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp37_ = f; + _tmp33_ = f; #line 5445 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp35_, _tmp36_, _tmp37_); + gee_multi_map_set (_tmp31_, _tmp32_, _tmp33_); #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 41798 "Photo.c" +#line 41840 "Photo.c" } #line 5443 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 41802 "Photo.c" +#line 41844 "Photo.c" } } #line 5449 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp38_ = photo; + _tmp34_ = photo; #line 5449 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self); #line 5450 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp39_ = photo; + _tmp35_ = photo; #line 5450 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self); #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_files); #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (source); -#line 41819 "Photo.c" +#line 41861 "Photo.c" } #line 5431 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_source_it); -#line 41823 "Photo.c" +#line 41865 "Photo.c" } } #line 5454 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp40_ = removed; -#line 5454 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp40_ != NULL) { -#line 41830 "Photo.c" + if (removed != NULL) { +#line 41870 "Photo.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp41_; - GeeIterator* _tmp42_; -#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp41_ = removed; + GeeIterator* _tmp36_; #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp42_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp36_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable)); #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _source_it = _tmp42_; + _source_it = _tmp36_; #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41843 "Photo.c" - GeeIterator* _tmp43_; - gboolean _tmp44_; +#line 41880 "Photo.c" + GeeIterator* _tmp37_; DataSource* source = NULL; - GeeIterator* _tmp45_; - gpointer _tmp46_; + GeeIterator* _tmp38_; + gpointer _tmp39_; LibraryPhoto* photo = NULL; - DataSource* _tmp47_; - LibraryPhoto* _tmp48_; - GeeMultiMap* _tmp73_; - LibraryPhoto* _tmp74_; - GeeMultiMap* _tmp75_; - LibraryPhoto* _tmp76_; - LibraryPhoto* _tmp77_; - guint _tmp78_; - LibraryPhoto* _tmp79_; - guint _tmp80_; + DataSource* _tmp40_; + LibraryPhoto* _tmp41_; + GeeMultiMap* _tmp64_; + LibraryPhoto* _tmp65_; + GeeMultiMap* _tmp66_; + LibraryPhoto* _tmp67_; + LibraryPhoto* _tmp68_; + guint _tmp69_; + LibraryPhoto* _tmp70_; + guint _tmp71_; #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp43_ = _source_it; + _tmp37_ = _source_it; #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp44_ = gee_iterator_next (_tmp43_); -#line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp44_) { + if (!gee_iterator_next (_tmp37_)) { #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41868 "Photo.c" +#line 41902 "Photo.c" } #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp45_ = _source_it; + _tmp38_ = _source_it; #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp46_ = gee_iterator_get (_tmp45_); + _tmp39_ = gee_iterator_get (_tmp38_); #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" - source = (DataSource*) _tmp46_; + source = (DataSource*) _tmp39_; #line 5456 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp47_ = source; + _tmp40_ = source; #line 5456 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 5456 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp48_; -#line 41882 "Photo.c" + photo = _tmp41_; +#line 41916 "Photo.c" { GeeIterator* _f_it = NULL; - GeeMultiMap* _tmp49_; - LibraryPhoto* _tmp50_; - GeeCollection* _tmp51_; - GeeCollection* _tmp52_; - GeeIterator* _tmp53_; - GeeIterator* _tmp54_; + GeeMultiMap* _tmp42_; + LibraryPhoto* _tmp43_; + GeeCollection* _tmp44_; + GeeCollection* _tmp45_; + GeeIterator* _tmp46_; + GeeIterator* _tmp47_; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp49_ = self->priv->reverse_editable_file_map; + _tmp42_ = self->priv->reverse_editable_file_map; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp50_ = photo; + _tmp43_ = photo; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp51_ = gee_multi_map_get (_tmp49_, _tmp50_); + _tmp44_ = gee_multi_map_get (_tmp42_, _tmp43_); #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp52_ = _tmp51_; + _tmp45_ = _tmp44_; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp53_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp54_ = _tmp53_; + _tmp47_ = _tmp46_; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp52_); + _g_object_unref0 (_tmp45_); #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp54_; + _f_it = _tmp47_; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41909 "Photo.c" - GeeIterator* _tmp55_; - gboolean _tmp56_; +#line 41943 "Photo.c" + GeeIterator* _tmp48_; GFile* f = NULL; - GeeIterator* _tmp57_; - gpointer _tmp58_; - GeeHashMap* _tmp59_; - GFile* _tmp60_; -#line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp55_ = _f_it; + GeeIterator* _tmp49_; + gpointer _tmp50_; + GeeHashMap* _tmp51_; + GFile* _tmp52_; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp56_ = gee_iterator_next (_tmp55_); + _tmp48_ = _f_it; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp56_) { + if (!gee_iterator_next (_tmp48_)) { #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41925 "Photo.c" +#line 41956 "Photo.c" } #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp57_ = _f_it; + _tmp49_ = _f_it; #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp58_ = gee_iterator_get (_tmp57_); + _tmp50_ = gee_iterator_get (_tmp49_); #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp58_; + f = (GFile*) _tmp50_; #line 5458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp59_ = self->priv->editable_file_map; + _tmp51_ = self->priv->editable_file_map; #line 5458 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp60_ = f; + _tmp52_ = f; #line 5458 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp52_, NULL); #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 41941 "Photo.c" +#line 41972 "Photo.c" } #line 5457 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 41945 "Photo.c" +#line 41976 "Photo.c" } { GeeIterator* _f_it = NULL; - GeeMultiMap* _tmp61_; - LibraryPhoto* _tmp62_; - GeeCollection* _tmp63_; - GeeCollection* _tmp64_; - GeeIterator* _tmp65_; - GeeIterator* _tmp66_; + GeeMultiMap* _tmp53_; + LibraryPhoto* _tmp54_; + GeeCollection* _tmp55_; + GeeCollection* _tmp56_; + GeeIterator* _tmp57_; + GeeIterator* _tmp58_; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp61_ = self->priv->reverse_development_file_map; + _tmp53_ = self->priv->reverse_development_file_map; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp62_ = photo; + _tmp54_ = photo; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp63_ = gee_multi_map_get (_tmp61_, _tmp62_); + _tmp55_ = gee_multi_map_get (_tmp53_, _tmp54_); #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp64_ = _tmp63_; + _tmp56_ = _tmp55_; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp65_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp57_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp66_ = _tmp65_; + _tmp58_ = _tmp57_; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp64_); + _g_object_unref0 (_tmp56_); #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp66_; + _f_it = _tmp58_; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 41973 "Photo.c" - GeeIterator* _tmp67_; - gboolean _tmp68_; +#line 42004 "Photo.c" + GeeIterator* _tmp59_; GFile* f = NULL; - GeeIterator* _tmp69_; - gpointer _tmp70_; - GeeHashMap* _tmp71_; - GFile* _tmp72_; -#line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp67_ = _f_it; + GeeIterator* _tmp60_; + gpointer _tmp61_; + GeeHashMap* _tmp62_; + GFile* _tmp63_; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp68_ = gee_iterator_next (_tmp67_); + _tmp59_ = _f_it; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp68_) { + if (!gee_iterator_next (_tmp59_)) { #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 41989 "Photo.c" +#line 42017 "Photo.c" } #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp69_ = _f_it; + _tmp60_ = _f_it; #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp70_ = gee_iterator_get (_tmp69_); + _tmp61_ = gee_iterator_get (_tmp60_); #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp70_; + f = (GFile*) _tmp61_; #line 5461 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp71_ = self->priv->development_file_map; + _tmp62_ = self->priv->development_file_map; #line 5461 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp72_ = f; + _tmp63_ = f; #line 5461 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp63_, NULL); #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 42005 "Photo.c" +#line 42033 "Photo.c" } #line 5460 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 42009 "Photo.c" +#line 42037 "Photo.c" } #line 5463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp73_ = self->priv->reverse_editable_file_map; + _tmp64_ = self->priv->reverse_editable_file_map; #line 5463 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp74_ = photo; + _tmp65_ = photo; #line 5463 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove_all (_tmp73_, _tmp74_); + gee_multi_map_remove_all (_tmp64_, _tmp65_); #line 5464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp75_ = self->priv->reverse_development_file_map; + _tmp66_ = self->priv->reverse_development_file_map; #line 5464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp76_ = photo; + _tmp67_ = photo; #line 5464 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove_all (_tmp75_, _tmp76_); + gee_multi_map_remove_all (_tmp66_, _tmp67_); #line 5466 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp77_ = photo; + _tmp68_ = photo; #line 5466 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp78_, NULL, FALSE); + g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp69_, NULL, FALSE); #line 5466 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp78_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp69_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self); #line 5467 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp79_ = photo; + _tmp70_ = photo; #line 5467 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp80_, NULL, FALSE); + g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp71_, NULL, FALSE); #line 5467 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp80_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp71_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self); #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (source); -#line 42039 "Photo.c" +#line 42067 "Photo.c" } #line 5455 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_source_it); -#line 42043 "Photo.c" +#line 42071 "Photo.c" } } #line 5471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp81_ = added; -#line 5471 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp82_ = removed; -#line 5471 "/home/jens/Source/shotwell/src/Photo.vala" - SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp81_, _tmp82_); -#line 42052 "Photo.c" + 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), added, removed); +#line 42076 "Photo.c" } -static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhotoSourceHoldingTank* self, Photo* _photo, GFile* old_file, GFile* new_file) { +static void +library_photo_source_holding_tank_on_editable_replaced (LibraryPhotoSourceHoldingTank* self, + Photo* _photo, + GFile* old_file, + GFile* new_file) +{ LibraryPhoto* photo = NULL; - Photo* _tmp0_; + LibraryPhoto* _tmp0_; LibraryPhoto* _tmp1_; - LibraryPhoto* _tmp2_; - GFile* _tmp3_; - GFile* _tmp9_; - GeeMultiMap* _tmp13_; - LibraryPhoto* _tmp14_; - GFile* _tmp15_; + GeeMultiMap* _tmp7_; + LibraryPhoto* _tmp8_; #line 5474 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self)); #line 5474 "/home/jens/Source/shotwell/src/Photo.vala" @@ -42076,267 +42101,243 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto #line 5474 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file)); #line 5475 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _photo; -#line 5475 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_photo, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _photo) : NULL); #line 5475 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp1_; + photo = _tmp0_; #line 5476 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo; + _tmp1_ = photo; #line 5476 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp2_ != NULL, "photo != null"); -#line 5478 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = old_file; + _vala_assert (_tmp1_ != NULL, "photo != null"); #line 5478 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp3_ != NULL) { -#line 42088 "Photo.c" - GeeHashMap* _tmp4_; - GFile* _tmp5_; - GeeMultiMap* _tmp6_; - LibraryPhoto* _tmp7_; - GFile* _tmp8_; -#line 5479 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = self->priv->editable_file_map; + if (old_file != NULL) { +#line 42109 "Photo.c" + GeeHashMap* _tmp2_; + GeeMultiMap* _tmp3_; + LibraryPhoto* _tmp4_; #line 5479 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = old_file; + _tmp2_ = self->priv->editable_file_map; #line 5479 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, NULL); -#line 5480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->priv->reverse_editable_file_map; + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), old_file, NULL); #line 5480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo; + _tmp3_ = self->priv->reverse_editable_file_map; #line 5480 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = old_file; + _tmp4_ = photo; #line 5480 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove (_tmp6_, _tmp7_, _tmp8_); -#line 42108 "Photo.c" + gee_multi_map_remove (_tmp3_, _tmp4_, old_file); +#line 42123 "Photo.c" } #line 5483 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = new_file; -#line 5483 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp9_ != NULL) { -#line 42114 "Photo.c" - GeeHashMap* _tmp10_; - GFile* _tmp11_; - LibraryPhoto* _tmp12_; -#line 5484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = self->priv->editable_file_map; + if (new_file != NULL) { +#line 42127 "Photo.c" + GeeHashMap* _tmp5_; + LibraryPhoto* _tmp6_; #line 5484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = new_file; + _tmp5_ = self->priv->editable_file_map; #line 5484 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = photo; + _tmp6_ = photo; #line 5484 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_); -#line 42126 "Photo.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), new_file, _tmp6_); +#line 42136 "Photo.c" } #line 5485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = self->priv->reverse_editable_file_map; + _tmp7_ = self->priv->reverse_editable_file_map; #line 5485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = photo; -#line 5485 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = new_file; + _tmp8_ = photo; #line 5485 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp13_, _tmp14_, _tmp15_); + gee_multi_map_set (_tmp7_, _tmp8_, new_file); #line 5474 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 42138 "Photo.c" +#line 42146 "Photo.c" } -static void library_photo_source_holding_tank_on_raw_development_modified (LibraryPhotoSourceHoldingTank* self, Photo* _photo) { +static void +library_photo_source_holding_tank_on_raw_development_modified (LibraryPhotoSourceHoldingTank* self, + Photo* _photo) +{ LibraryPhoto* photo = NULL; - Photo* _tmp0_; + LibraryPhoto* _tmp0_; LibraryPhoto* _tmp1_; - LibraryPhoto* _tmp2_; - GeeMultiMap* _tmp3_; - LibraryPhoto* _tmp4_; - gboolean _tmp5_; + GeeMultiMap* _tmp2_; + LibraryPhoto* _tmp3_; GeeCollection* raw_list = NULL; - LibraryPhoto* _tmp20_; - GeeCollection* _tmp21_; - GeeCollection* _tmp22_; + LibraryPhoto* _tmp17_; + GeeCollection* _tmp18_; + GeeCollection* _tmp19_; #line 5488 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self)); #line 5488 "/home/jens/Source/shotwell/src/Photo.vala" g_return_if_fail (IS_PHOTO (_photo)); #line 5489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = _photo; -#line 5489 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_photo, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _photo) : NULL); #line 5489 "/home/jens/Source/shotwell/src/Photo.vala" - photo = _tmp1_; + photo = _tmp0_; #line 5490 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = photo; + _tmp1_ = photo; #line 5490 "/home/jens/Source/shotwell/src/Photo.vala" - _vala_assert (_tmp2_ != NULL, "photo != null"); + _vala_assert (_tmp1_ != NULL, "photo != null"); #line 5493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = self->priv->reverse_development_file_map; -#line 5493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp4_ = photo; + _tmp2_ = self->priv->reverse_development_file_map; #line 5493 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_); + _tmp3_ = photo; #line 5493 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp5_) { -#line 42176 "Photo.c" - GeeMultiMap* _tmp18_; - LibraryPhoto* _tmp19_; + if (gee_multi_map_contains (_tmp2_, _tmp3_)) { +#line 42181 "Photo.c" + GeeMultiMap* _tmp15_; + LibraryPhoto* _tmp16_; { GeeIterator* _f_it = NULL; - GeeMultiMap* _tmp6_; - LibraryPhoto* _tmp7_; - GeeCollection* _tmp8_; - GeeCollection* _tmp9_; - GeeIterator* _tmp10_; - GeeIterator* _tmp11_; + GeeMultiMap* _tmp4_; + LibraryPhoto* _tmp5_; + GeeCollection* _tmp6_; + GeeCollection* _tmp7_; + GeeIterator* _tmp8_; + GeeIterator* _tmp9_; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp6_ = self->priv->reverse_development_file_map; + _tmp4_ = self->priv->reverse_development_file_map; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp7_ = photo; + _tmp5_ = photo; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_); + _tmp6_ = gee_multi_map_get (_tmp4_, _tmp5_); #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp7_); #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp11_; + _f_it = _tmp9_; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 42205 "Photo.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 42210 "Photo.c" + GeeIterator* _tmp10_; GFile* f = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - GeeHashMap* _tmp16_; - GFile* _tmp17_; -#line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp12_ = _f_it; + GeeIterator* _tmp11_; + gpointer _tmp12_; + GeeHashMap* _tmp13_; + GFile* _tmp14_; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp10_ = _f_it; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp10_)) { #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 42221 "Photo.c" +#line 42223 "Photo.c" } #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp14_ = _f_it; + _tmp11_ = _f_it; #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp15_; + f = (GFile*) _tmp12_; #line 5495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp16_ = self->priv->development_file_map; + _tmp13_ = self->priv->development_file_map; #line 5495 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp17_ = f; + _tmp14_ = f; #line 5495 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_, NULL); #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 42237 "Photo.c" +#line 42239 "Photo.c" } #line 5494 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 42241 "Photo.c" +#line 42243 "Photo.c" } #line 5496 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp18_ = self->priv->reverse_development_file_map; + _tmp15_ = self->priv->reverse_development_file_map; #line 5496 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp19_ = photo; + _tmp16_ = photo; #line 5496 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_remove_all (_tmp18_, _tmp19_); -#line 42249 "Photo.c" + gee_multi_map_remove_all (_tmp15_, _tmp16_); +#line 42251 "Photo.c" } #line 5500 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp20_ = photo; + _tmp17_ = photo; #line 5500 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp21_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo)); + _tmp18_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo)); #line 5500 "/home/jens/Source/shotwell/src/Photo.vala" - raw_list = _tmp21_; + raw_list = _tmp18_; #line 5501 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp22_ = raw_list; + _tmp19_ = raw_list; #line 5501 "/home/jens/Source/shotwell/src/Photo.vala" - if (_tmp22_ != NULL) { -#line 42261 "Photo.c" + if (_tmp19_ != NULL) { +#line 42263 "Photo.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp23_; - GeeIterator* _tmp24_; + GeeCollection* _tmp20_; + GeeIterator* _tmp21_; #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp23_ = raw_list; + _tmp20_ = raw_list; #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp21_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ITERABLE, GeeIterable)); #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _f_it = _tmp24_; + _f_it = _tmp21_; #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" while (TRUE) { -#line 42274 "Photo.c" - GeeIterator* _tmp25_; - gboolean _tmp26_; +#line 42276 "Photo.c" + GeeIterator* _tmp22_; GFile* f = NULL; - GeeIterator* _tmp27_; - gpointer _tmp28_; - GeeHashMap* _tmp29_; + GeeIterator* _tmp23_; + gpointer _tmp24_; + GeeHashMap* _tmp25_; + GFile* _tmp26_; + LibraryPhoto* _tmp27_; + GeeMultiMap* _tmp28_; + LibraryPhoto* _tmp29_; GFile* _tmp30_; - LibraryPhoto* _tmp31_; - GeeMultiMap* _tmp32_; - LibraryPhoto* _tmp33_; - GFile* _tmp34_; #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp25_ = _f_it; + _tmp22_ = _f_it; #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp26_ = gee_iterator_next (_tmp25_); -#line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - if (!_tmp26_) { + if (!gee_iterator_next (_tmp22_)) { #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" break; -#line 42294 "Photo.c" +#line 42293 "Photo.c" } #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp27_ = _f_it; + _tmp23_ = _f_it; #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp28_ = gee_iterator_get (_tmp27_); + _tmp24_ = gee_iterator_get (_tmp23_); #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" - f = (GFile*) _tmp28_; + f = (GFile*) _tmp24_; #line 5503 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp29_ = self->priv->development_file_map; + _tmp25_ = self->priv->development_file_map; #line 5503 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp30_ = f; + _tmp26_ = f; #line 5503 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp31_ = photo; + _tmp27_ = photo; #line 5503 "/home/jens/Source/shotwell/src/Photo.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_, _tmp31_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, _tmp27_); #line 5504 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp32_ = self->priv->reverse_development_file_map; + _tmp28_ = self->priv->reverse_development_file_map; #line 5504 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp33_ = photo; + _tmp29_ = photo; #line 5504 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp34_ = f; + _tmp30_ = f; #line 5504 "/home/jens/Source/shotwell/src/Photo.vala" - gee_multi_map_set (_tmp32_, _tmp33_, _tmp34_); + gee_multi_map_set (_tmp28_, _tmp29_, _tmp30_); #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (f); -#line 42320 "Photo.c" +#line 42319 "Photo.c" } #line 5502 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (_f_it); -#line 42324 "Photo.c" +#line 42323 "Photo.c" } } #line 5488 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (raw_list); #line 5488 "/home/jens/Source/shotwell/src/Photo.vala" _g_object_unref0 (photo); -#line 42331 "Photo.c" +#line 42330 "Photo.c" } -static void library_photo_source_holding_tank_class_init (LibraryPhotoSourceHoldingTankClass * klass) { +static void +library_photo_source_holding_tank_class_init (LibraryPhotoSourceHoldingTankClass * klass) +{ #line 5404 "/home/jens/Source/shotwell/src/Photo.vala" library_photo_source_holding_tank_parent_class = g_type_class_peek_parent (klass); #line 5404 "/home/jens/Source/shotwell/src/Photo.vala" @@ -42345,11 +42346,13 @@ static void library_photo_source_holding_tank_class_init (LibraryPhotoSourceHold g_type_class_add_private (klass, sizeof (LibraryPhotoSourceHoldingTankPrivate)); #line 5404 "/home/jens/Source/shotwell/src/Photo.vala" ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) library_photo_source_holding_tank_real_notify_contents_altered; -#line 42344 "Photo.c" +#line 42345 "Photo.c" } -static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceHoldingTank * self) { +static void +library_photo_source_holding_tank_instance_init (LibraryPhotoSourceHoldingTank * self) +{ GeeHashMap* _tmp0_; GeeHashMap* _tmp1_; GeeHashMultiMap* _tmp2_; @@ -42372,11 +42375,13 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH _tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 5411 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->reverse_development_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 42371 "Photo.c" +#line 42374 "Photo.c" } -static void library_photo_source_holding_tank_finalize (SourceHoldingTank * obj) { +static void +library_photo_source_holding_tank_finalize (SourceHoldingTank * obj) +{ LibraryPhotoSourceHoldingTank * self; #line 5404 "/home/jens/Source/shotwell/src/Photo.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank); @@ -42390,11 +42395,13 @@ static void library_photo_source_holding_tank_finalize (SourceHoldingTank * obj) _g_object_unref0 (self->priv->reverse_development_file_map); #line 5404 "/home/jens/Source/shotwell/src/Photo.vala" SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->finalize (obj); -#line 42389 "Photo.c" +#line 42394 "Photo.c" } -GType library_photo_source_holding_tank_get_type (void) { +GType +library_photo_source_holding_tank_get_type (void) +{ static volatile gsize library_photo_source_holding_tank_type_id__volatile = 0; if (g_once_init_enter (&library_photo_source_holding_tank_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotoSourceHoldingTankClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photo_source_holding_tank_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhotoSourceHoldingTank), 0, (GInstanceInitFunc) library_photo_source_holding_tank_instance_init, NULL }; @@ -42406,7 +42413,11 @@ GType library_photo_source_holding_tank_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -42418,7 +42429,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } |