diff options
Diffstat (limited to 'src/PhotoMonitor.c')
| -rw-r--r-- | src/PhotoMonitor.c | 7047 |
1 files changed, 3541 insertions, 3506 deletions
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c index f9c7e9f..c87391c 100644 --- a/src/PhotoMonitor.c +++ b/src/PhotoMonitor.c @@ -1,4 +1,4 @@ -/* PhotoMonitor.c generated by valac 0.36.6, the Vala compiler +/* PhotoMonitor.c generated by valac 0.40.4, the Vala compiler * generated from PhotoMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <gio/gio.h> @@ -240,6 +241,11 @@ typedef struct _PhotoMonitorReimportEditableJobClass PhotoMonitorReimportEditabl typedef struct _PhotoMonitorReimportRawDevelopmentJob PhotoMonitorReimportRawDevelopmentJob; typedef struct _PhotoMonitorReimportRawDevelopmentJobClass PhotoMonitorReimportRawDevelopmentJobClass; +enum { + PHOTO_MONITOR_0_PROPERTY, + PHOTO_MONITOR_NUM_PROPERTIES +}; +static GParamSpec* photo_monitor_properties[PHOTO_MONITOR_NUM_PROPERTIES]; #define _workers_unref0(var) ((var == NULL) ? NULL : (var = (workers_unref (var), NULL))) #define TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION (library_photo_source_collection_get_type ()) @@ -597,9 +603,15 @@ static gpointer photo_monitor_reimport_raw_development_job_parent_class = NULL; gpointer monitorable_updates_ref (gpointer instance); void monitorable_updates_unref (gpointer instance); -GParamSpec* param_spec_monitorable_updates (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_monitorable_updates (GValue* value, gpointer v_object); -void value_take_monitorable_updates (GValue* value, gpointer v_object); +GParamSpec* param_spec_monitorable_updates (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_monitorable_updates (GValue* value, + gpointer v_object); +void value_take_monitorable_updates (GValue* value, + gpointer v_object); gpointer value_get_monitorable_updates (const GValue* value); GType monitorable_updates_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; @@ -611,13 +623,12 @@ GType photo_updates_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; -enum { - PHOTO_UPDATES_DUMMY_PROPERTY -}; PhotoUpdates* photo_updates_new (LibraryPhoto* photo); -PhotoUpdates* photo_updates_construct (GType object_type, LibraryPhoto* photo); +PhotoUpdates* photo_updates_construct (GType object_type, + LibraryPhoto* photo); MonitorableUpdates* monitorable_updates_new (Monitorable* monitorable); -MonitorableUpdates* monitorable_updates_construct (GType object_type, Monitorable* monitorable); +MonitorableUpdates* monitorable_updates_construct (GType object_type, + Monitorable* monitorable); static void photo_updates_real_mark_offline (MonitorableUpdates* base); void monitorable_updates_mark_offline (MonitorableUpdates* self); gboolean photo_updates_is_reimport_master (PhotoUpdates* self); @@ -628,41 +639,69 @@ GeeCollection* photo_updates_get_raw_developer_files (PhotoUpdates* self); static gboolean photo_updates_real_is_in_alteration (MonitorableUpdates* base); gboolean monitorable_updates_is_in_alteration (MonitorableUpdates* self); gboolean photo_updates_is_revert_to_master (PhotoUpdates* self); -void photo_updates_set_editable_file (PhotoUpdates* self, GFile* file); -static void photo_updates_real_set_editable_file (PhotoUpdates* self, GFile* file); -void photo_updates_set_editable_file_info (PhotoUpdates* self, GFileInfo* info); -static void photo_updates_real_set_editable_file_info (PhotoUpdates* self, GFileInfo* info); -void photo_updates_set_editable_file_info_altered (PhotoUpdates* self, gboolean altered); -static void photo_updates_real_set_editable_file_info_altered (PhotoUpdates* self, gboolean altered); -void photo_updates_set_editable_in_alteration (PhotoUpdates* self, gboolean in_alteration); -static void photo_updates_real_set_editable_in_alteration (PhotoUpdates* self, gboolean in_alteration); -void photo_updates_set_raw_development_in_alteration (PhotoUpdates* self, gboolean in_alteration); -static void photo_updates_real_set_raw_development_in_alteration (PhotoUpdates* self, gboolean in_alteration); -void photo_updates_set_raw_developer_file_info_altered (PhotoUpdates* self, gboolean altered); -static void photo_updates_real_set_raw_developer_file_info_altered (PhotoUpdates* self, gboolean altered); -void photo_updates_set_revert_to_master (PhotoUpdates* self, gboolean revert); -static void photo_updates_real_set_revert_to_master (PhotoUpdates* self, gboolean revert); -void photo_updates_add_raw_developer_file (PhotoUpdates* self, GFile* file); -static void photo_updates_real_add_raw_developer_file (PhotoUpdates* self, GFile* file); +void photo_updates_set_editable_file (PhotoUpdates* self, + GFile* file); +static void photo_updates_real_set_editable_file (PhotoUpdates* self, + GFile* file); +void photo_updates_set_editable_file_info (PhotoUpdates* self, + GFileInfo* info); +static void photo_updates_real_set_editable_file_info (PhotoUpdates* self, + GFileInfo* info); +void photo_updates_set_editable_file_info_altered (PhotoUpdates* self, + gboolean altered); +static void photo_updates_real_set_editable_file_info_altered (PhotoUpdates* self, + gboolean altered); +void photo_updates_set_editable_in_alteration (PhotoUpdates* self, + gboolean in_alteration); +static void photo_updates_real_set_editable_in_alteration (PhotoUpdates* self, + gboolean in_alteration); +void photo_updates_set_raw_development_in_alteration (PhotoUpdates* self, + gboolean in_alteration); +static void photo_updates_real_set_raw_development_in_alteration (PhotoUpdates* self, + gboolean in_alteration); +void photo_updates_set_raw_developer_file_info_altered (PhotoUpdates* self, + gboolean altered); +static void photo_updates_real_set_raw_developer_file_info_altered (PhotoUpdates* self, + gboolean altered); +void photo_updates_set_revert_to_master (PhotoUpdates* self, + gboolean revert); +static void photo_updates_real_set_revert_to_master (PhotoUpdates* self, + gboolean revert); +void photo_updates_add_raw_developer_file (PhotoUpdates* self, + GFile* file); +static void photo_updates_real_add_raw_developer_file (PhotoUpdates* self, + GFile* file); void photo_updates_clear_raw_developer_files (PhotoUpdates* self); static void photo_updates_real_clear_raw_developer_files (PhotoUpdates* self); -void photo_updates_set_reimport_master (PhotoUpdates* self, gboolean reimport); -static void photo_updates_real_set_reimport_master (PhotoUpdates* self, gboolean reimport); +void photo_updates_set_reimport_master (PhotoUpdates* self, + gboolean reimport); +static void photo_updates_real_set_reimport_master (PhotoUpdates* self, + gboolean reimport); void monitorable_updates_mark_online (MonitorableUpdates* self); -void photo_updates_set_reimport_editable (PhotoUpdates* self, gboolean reimport); -static void photo_updates_real_set_reimport_editable (PhotoUpdates* self, gboolean reimport); +void photo_updates_set_reimport_editable (PhotoUpdates* self, + gboolean reimport); +static void photo_updates_real_set_reimport_editable (PhotoUpdates* self, + gboolean reimport); gboolean monitorable_updates_is_set_offline (MonitorableUpdates* self); -void photo_updates_set_reimport_raw_developments (PhotoUpdates* self, gboolean reimport); -static void photo_updates_real_set_reimport_raw_developments (PhotoUpdates* self, gboolean reimport); +void photo_updates_set_reimport_raw_developments (PhotoUpdates* self, + gboolean reimport); +static void photo_updates_real_set_reimport_raw_developments (PhotoUpdates* self, + gboolean reimport); static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base); gboolean monitorable_updates_is_all_updated (MonitorableUpdates* self); static void photo_updates_finalize (MonitorableUpdates * obj); GType media_monitor_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 source_collection_get_type (void) G_GNUC_CONST; @@ -671,91 +710,171 @@ GType media_source_collection_get_type (void) G_GNUC_CONST; GType media_monitor_discovered_file_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 photo_monitor_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; gpointer background_job_ref (gpointer instance); void background_job_unref (gpointer instance); -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_background_job (GValue* value, gpointer v_object); -void value_take_background_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_background_job (GValue* value, + gpointer v_object); +void value_take_background_job (GValue* value, + gpointer v_object); gpointer value_get_background_job (const GValue* value); GType background_job_get_type (void) G_GNUC_CONST; static GType photo_monitor_reimport_master_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static GType photo_monitor_reimport_editable_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static GType photo_monitor_reimport_raw_development_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define PHOTO_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_MONITOR, PhotoMonitorPrivate)) -enum { - PHOTO_MONITOR_DUMMY_PROPERTY -}; #define PHOTO_MONITOR_MAX_REIMPORT_JOBS_PER_CYCLE 20 #define PHOTO_MONITOR_MAX_REVERTS_PER_CYCLE 5 -PhotoMonitor* photo_monitor_new (Workers* workers, GCancellable* cancellable); -PhotoMonitor* photo_monitor_construct (GType object_type, Workers* workers, GCancellable* cancellable); +PhotoMonitor* photo_monitor_new (Workers* workers, + GCancellable* cancellable); +PhotoMonitor* photo_monitor_construct (GType object_type, + Workers* workers, + GCancellable* cancellable); GType library_photo_source_collection_get_type (void) G_GNUC_CONST; -MediaMonitor* media_monitor_construct (GType object_type, MediaSourceCollection* sources, GCancellable* cancellable); -static MonitorableUpdates* photo_monitor_real_create_updates (MediaMonitor* base, Monitorable* monitorable); +MediaMonitor* media_monitor_construct (GType object_type, + MediaSourceCollection* sources, + GCancellable* cancellable); +static MonitorableUpdates* photo_monitor_real_create_updates (MediaMonitor* base, + Monitorable* monitorable); static MediaSourceCollection* photo_monitor_real_get_media_source_collection (MediaMonitor* base); -static gboolean photo_monitor_real_is_file_represented (MediaMonitor* base, GFile* file); +static gboolean photo_monitor_real_is_file_represented (MediaMonitor* base, + GFile* file); GType library_photo_source_collection_state_get_type (void) G_GNUC_CONST; -static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, GFile* file, LibraryPhotoSourceCollectionState* state); +static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, + GFile* file, + LibraryPhotoSourceCollectionState* state); static void photo_monitor_real_close (MediaMonitor* base); void background_job_cancel (BackgroundJob* self); void media_monitor_close (MediaMonitor* self); -static void photo_monitor_cancel_reimports (PhotoMonitor* self, LibraryPhoto* photo); -static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable* * monitorable); -static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonitor* base, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_); -void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matched_development); +static void photo_monitor_cancel_reimports (PhotoMonitor* self, + LibraryPhoto* photo); +static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (MediaMonitor* base, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable); +static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonitor* base, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_); +void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, + GFileInfo* info, + GeeCollection* matches_master, + GeeCollection* matches_editable, + GeeCollection* matched_development); gchar* data_object_to_string (DataObject* self); gboolean photo_does_editable_exist (Photo* self); -void photo_revert_to_master (Photo* self, gboolean notify); -void photo_monitor_update_editable_file (PhotoMonitor* self, LibraryPhoto* photo, GFile* file); -void photo_monitor_update_raw_development_file (PhotoMonitor* self, LibraryPhoto* photo, GFile* file); -static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, Monitorable* monitorable, int* result_length1); +void photo_revert_to_master (Photo* self, + gboolean notify); +void photo_monitor_update_editable_file (PhotoMonitor* self, + LibraryPhoto* photo, + GFile* file); +void photo_monitor_update_raw_development_file (PhotoMonitor* self, + LibraryPhoto* photo, + GFile* file); +static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, + Monitorable* monitorable, + int* result_length1); gboolean photo_has_editable (Photo* self); GFile* photo_get_editable_file (Photo* self); -static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* value); +static void _vala_array_add132 (GFile** * array, + int* length, + int* size, + GFile* value); GeeCollection* photo_get_raw_developer_files (Photo* self); -static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* value); -static GFile** _vala_array_dup31 (GFile** self, int length); -static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Monitorable* monitorable, GFile* file, GFileInfo* info); -GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable); -static void photo_monitor_check_for_master_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info); -GFile* photo_monitor_get_editable_file (PhotoMonitor* self, LibraryPhoto* photo); -static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info); -GeeCollection* photo_monitor_get_raw_development_files (PhotoMonitor* self, LibraryPhoto* photo); -static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info); +static void _vala_array_add133 (GFile** * array, + int* length, + int* size, + GFile* value); +static GFile** _vala_array_dup26 (GFile** self, + int length); +static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, + Monitorable* monitorable, + GFile* file, + GFileInfo* info); +GFile* media_monitor_get_master_file (MediaMonitor* self, + Monitorable* monitorable); +static void photo_monitor_check_for_master_changes (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info); +GFile* photo_monitor_get_editable_file (PhotoMonitor* self, + LibraryPhoto* photo); +static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info); +GeeCollection* photo_monitor_get_raw_development_files (PhotoMonitor* self, + LibraryPhoto* photo); +static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info); static void photo_monitor_real_notify_discovery_completing (MediaMonitor* base); 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; BackingPhotoRow* photo_get_master_photo_row (Photo* self); -gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info); -gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info); -void media_monitor_update_master_file_info_altered (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, Monitorable* monitorable, GFileInfo* info); -void photo_monitor_update_reimport_master (PhotoMonitor* self, LibraryPhoto* photo); -void photo_monitor_update_revert_to_master (PhotoMonitor* self, LibraryPhoto* photo); +gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, + GFileInfo* info); +gboolean backing_photo_row_is_touched (BackingPhotoRow* self, + GFileInfo* info); +void media_monitor_update_master_file_info_altered (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, + Monitorable* monitorable, + GFileInfo* info); +void photo_monitor_update_reimport_master (PhotoMonitor* self, + LibraryPhoto* photo); +void photo_monitor_update_revert_to_master (PhotoMonitor* self, + LibraryPhoto* photo); BackingPhotoRow* photo_get_editable_photo_row (Photo* self); -void photo_monitor_update_editable_file_info_altered (PhotoMonitor* self, LibraryPhoto* photo); -void photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info); -void photo_monitor_update_reimport_editable (PhotoMonitor* self, LibraryPhoto* photo); +void photo_monitor_update_editable_file_info_altered (PhotoMonitor* self, + LibraryPhoto* photo); +void photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info); +void photo_monitor_update_reimport_editable (PhotoMonitor* self, + LibraryPhoto* photo); GType raw_developer_get_type (void) G_GNUC_CONST; -void photo_set_raw_developer (Photo* self, RawDeveloper d); +void photo_set_raw_developer (Photo* self, + RawDeveloper d, + gboolean notify); GeeCollection* photo_get_raw_development_photo_rows (Photo* self); GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); @@ -765,157 +884,261 @@ GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); GType orientation_get_type (void) G_GNUC_CONST; -void photo_monitor_update_raw_development_file_info_altered (PhotoMonitor* self, LibraryPhoto* photo); -void photo_monitor_update_raw_development_file_alterations_completed (PhotoMonitor* self, LibraryPhoto* photo); -void photo_monitor_update_reimport_raw_developments (PhotoMonitor* self, LibraryPhoto* photo); -static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFile* file, GFileInfo* info); +void photo_monitor_update_raw_development_file_info_altered (PhotoMonitor* self, + LibraryPhoto* photo); +void photo_monitor_update_raw_development_file_alterations_completed (PhotoMonitor* self, + LibraryPhoto* photo); +void photo_monitor_update_reimport_raw_developments (PhotoMonitor* self, + LibraryPhoto* photo); +static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, + GFile* file, + GFileInfo* info); const gchar* library_photo_source_collection_state_to_string (LibraryPhotoSourceCollectionState self); void media_monitor_mdbg (const gchar* msg); -void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable); -static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile* old_file, GFile* new_file, GFileInfo* info); -void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitorable, GFile* file); -void media_monitor_update_offline (MediaMonitor* self, Monitorable* monitorable); -static gboolean photo_monitor_real_notify_file_altered (MediaMonitor* base, GFile* file); -void media_monitor_update_master_file_in_alteration (MediaMonitor* self, Monitorable* monitorable, gboolean in_alteration); -void photo_monitor_update_editable_file_in_alteration (PhotoMonitor* self, LibraryPhoto* photo, gboolean in_alteration); -void photo_monitor_update_raw_development_file_in_alteration (PhotoMonitor* self, LibraryPhoto* photo, gboolean in_alteration); -static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor* base, GFile* file); -static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonitor* base, GFile* file, GFileInfo* info); -static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, GFile* file); -static void photo_monitor_real_on_media_source_destroyed (MediaMonitor* base, DataSource* source); -void media_monitor_on_media_source_destroyed (MediaMonitor* self, DataSource* source); +void media_monitor_update_online (MediaMonitor* self, + Monitorable* monitorable); +static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, + GFile* old_file, + GFile* new_file, + GFileInfo* info); +void media_monitor_update_master_file (MediaMonitor* self, + Monitorable* monitorable, + GFile* file); +void media_monitor_update_offline (MediaMonitor* self, + Monitorable* monitorable); +static gboolean photo_monitor_real_notify_file_altered (MediaMonitor* base, + GFile* file); +void media_monitor_update_master_file_in_alteration (MediaMonitor* self, + Monitorable* monitorable, + gboolean in_alteration); +void photo_monitor_update_editable_file_in_alteration (PhotoMonitor* self, + LibraryPhoto* photo, + gboolean in_alteration); +void photo_monitor_update_raw_development_file_in_alteration (PhotoMonitor* self, + LibraryPhoto* photo, + gboolean in_alteration); +static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor* base, + GFile* file); +static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonitor* base, + GFile* file, + GFileInfo* info); +static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, + GFile* file); +static void photo_monitor_real_on_media_source_destroyed (MediaMonitor* base, + DataSource* source); +void media_monitor_on_media_source_destroyed (MediaMonitor* self, + DataSource* source); gboolean media_monitor_has_pending_updates (MediaMonitor* self); GeeCollection* media_monitor_get_monitorables (MediaMonitor* self); -PhotoUpdates* photo_monitor_get_existing_photo_updates (PhotoMonitor* self, LibraryPhoto* photo); +PhotoUpdates* photo_monitor_get_existing_photo_updates (PhotoMonitor* self, + LibraryPhoto* photo); GFile* monitorable_updates_get_master_file (MonitorableUpdates* self); GFile* media_source_get_master_file (MediaSource* self); -LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, GFile* file, LibraryPhotoSourceCollectionState* state); -PhotoUpdates* photo_monitor_fetch_photo_updates (PhotoMonitor* self, LibraryPhoto* photo); -MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable* monitorable); -MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Monitorable* monitorable); -static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error); -void media_monitor_process_updates (MediaMonitor* self, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error); +LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, + GFile* file, + LibraryPhotoSourceCollectionState* state); +PhotoUpdates* photo_monitor_fetch_photo_updates (PhotoMonitor* self, + LibraryPhoto* photo); +MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, + Monitorable* monitorable); +MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, + Monitorable* monitorable); +static void photo_monitor_real_process_updates (MediaMonitor* base, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error); +void media_monitor_process_updates (MediaMonitor* self, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error); #define MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE 100 GQuark database_error_quark (void); -void photo_set_many_editable_file (GeeMap* map, GError** error); +void photo_set_many_editable_file (GeeMap* map, + GError** error); void app_window_database_error (GError* err); -void photo_update_many_editable_timestamps (GeeMap* map, GError** error); -static PhotoMonitorReimportMasterJob* photo_monitor_reimport_master_job_new (PhotoMonitor* owner, LibraryPhoto* photo); -static PhotoMonitorReimportMasterJob* photo_monitor_reimport_master_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo); -void workers_enqueue (Workers* self, BackgroundJob* job); -static PhotoMonitorReimportEditableJob* photo_monitor_reimport_editable_job_new (PhotoMonitor* owner, LibraryPhoto* photo); -static PhotoMonitorReimportEditableJob* photo_monitor_reimport_editable_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo); -static PhotoMonitorReimportRawDevelopmentJob* photo_monitor_reimport_raw_development_job_new (PhotoMonitor* owner, LibraryPhoto* photo); -static PhotoMonitorReimportRawDevelopmentJob* photo_monitor_reimport_raw_development_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo); -static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJob* j); +void photo_update_many_editable_timestamps (GeeMap* map, + GError** error); +static PhotoMonitorReimportMasterJob* photo_monitor_reimport_master_job_new (PhotoMonitor* owner, + LibraryPhoto* photo); +static PhotoMonitorReimportMasterJob* photo_monitor_reimport_master_job_construct (GType object_type, + PhotoMonitor* owner, + LibraryPhoto* photo); +void workers_enqueue (Workers* self, + BackgroundJob* job); +static PhotoMonitorReimportEditableJob* photo_monitor_reimport_editable_job_new (PhotoMonitor* owner, + LibraryPhoto* photo); +static PhotoMonitorReimportEditableJob* photo_monitor_reimport_editable_job_construct (GType object_type, + PhotoMonitor* owner, + LibraryPhoto* photo); +static PhotoMonitorReimportRawDevelopmentJob* photo_monitor_reimport_raw_development_job_new (PhotoMonitor* owner, + LibraryPhoto* photo); +static PhotoMonitorReimportRawDevelopmentJob* photo_monitor_reimport_raw_development_job_construct (GType object_type, + PhotoMonitor* owner, + LibraryPhoto* photo); +static void photo_monitor_on_master_reimported (PhotoMonitor* self, + BackgroundJob* j); GType background_job_job_priority_get_type (void) G_GNUC_CONST; 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; -void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error); +void photo_finish_reimport_master (Photo* self, + PhotoReimportMasterState* state, + GError** error); gboolean media_source_is_offline (MediaSource* self); -static void photo_monitor_on_master_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j); -static void photo_monitor_on_editable_reimported (PhotoMonitor* self, BackgroundJob* j); +static void photo_monitor_on_master_reimport_cancelled (PhotoMonitor* self, + BackgroundJob* j); +static void photo_monitor_on_editable_reimported (PhotoMonitor* self, + BackgroundJob* j); 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; -void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* state, GError** error); -static void photo_monitor_on_editable_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j); -static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, BackgroundJob* j); +void photo_finish_reimport_editable (Photo* self, + PhotoReimportEditableState* state, + GError** error); +static void photo_monitor_on_editable_reimport_cancelled (PhotoMonitor* self, + BackgroundJob* j); +static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, + BackgroundJob* j); 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; -void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* state, GError** error); -static void photo_monitor_on_raw_development_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j); -enum { - PHOTO_MONITOR_REIMPORT_MASTER_JOB_DUMMY_PROPERTY -}; -static void _photo_monitor_on_master_reimported_completion_callback (BackgroundJob* job, gpointer self); -static void _photo_monitor_on_master_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); +void photo_finish_reimport_raw_development (Photo* self, + PhotoReimportRawDevelopmentState* state, + GError** error); +static void photo_monitor_on_raw_development_reimport_cancelled (PhotoMonitor* self, + BackgroundJob* j); +static void _photo_monitor_on_master_reimported_completion_callback (BackgroundJob* job, + gpointer self); +static void _photo_monitor_on_master_reimport_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; -BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore); +BackgroundJob* background_job_construct (GType object_type, + GObject* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + AbstractSemaphore* completion_semaphore); static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base); -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); static void photo_monitor_reimport_master_job_finalize (BackgroundJob * obj); -enum { - PHOTO_MONITOR_REIMPORT_EDITABLE_JOB_DUMMY_PROPERTY -}; -static void _photo_monitor_on_editable_reimported_completion_callback (BackgroundJob* job, gpointer self); -static void _photo_monitor_on_editable_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); +static void _photo_monitor_on_editable_reimported_completion_callback (BackgroundJob* job, + gpointer self); +static void _photo_monitor_on_editable_reimport_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* base); -gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState* * state, GError** error); +gboolean photo_prepare_for_reimport_editable (Photo* self, + PhotoReimportEditableState* * state, + GError** error); static void photo_monitor_reimport_editable_job_finalize (BackgroundJob * obj); -enum { - PHOTO_MONITOR_REIMPORT_RAW_DEVELOPMENT_JOB_DUMMY_PROPERTY -}; -static void _photo_monitor_on_raw_development_reimported_completion_callback (BackgroundJob* job, gpointer self); -static void _photo_monitor_on_raw_development_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); +static void _photo_monitor_on_raw_development_reimported_completion_callback (BackgroundJob* job, + gpointer self); +static void _photo_monitor_on_raw_development_reimport_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJob* base); -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); static void photo_monitor_reimport_raw_development_job_finalize (BackgroundJob * obj); static void photo_monitor_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static 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 gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 25 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self ? g_object_ref (self) : NULL; -#line 883 "PhotoMonitor.c" +#line 1105 "PhotoMonitor.c" } -PhotoUpdates* photo_updates_construct (GType object_type, LibraryPhoto* photo) { +PhotoUpdates* +photo_updates_construct (GType object_type, + LibraryPhoto* photo) +{ PhotoUpdates* self = NULL; LibraryPhoto* _tmp0_; - LibraryPhoto* _tmp1_; - LibraryPhoto* _tmp2_; #line 22 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 23 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 23 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self = (PhotoUpdates*) monitorable_updates_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE, Monitorable)); + self = (PhotoUpdates*) monitorable_updates_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MONITORABLE, Monitorable)); #line 25 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo; -#line 25 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp0_ = _g_object_ref0 (photo); #line 25 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (self->photo); #line 25 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->photo = _tmp2_; + self->photo = _tmp0_; #line 22 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self; -#line 908 "PhotoMonitor.c" +#line 1127 "PhotoMonitor.c" } -PhotoUpdates* photo_updates_new (LibraryPhoto* photo) { +PhotoUpdates* +photo_updates_new (LibraryPhoto* photo) +{ #line 22 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return photo_updates_construct (TYPE_PHOTO_UPDATES, photo); -#line 915 "PhotoMonitor.c" +#line 1136 "PhotoMonitor.c" } -static void photo_updates_real_mark_offline (MonitorableUpdates* base) { +static void +photo_updates_real_mark_offline (MonitorableUpdates* base) +{ PhotoUpdates * self; #line 28 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_UPDATES, PhotoUpdates); @@ -927,11 +1150,13 @@ static void photo_updates_real_mark_offline (MonitorableUpdates* base) { self->reimport_editable = FALSE; #line 33 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->reimport_raw_developments = FALSE; -#line 931 "PhotoMonitor.c" +#line 1154 "PhotoMonitor.c" } -gboolean photo_updates_is_reimport_master (PhotoUpdates* self) { +gboolean +photo_updates_is_reimport_master (PhotoUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 36 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -942,11 +1167,13 @@ gboolean photo_updates_is_reimport_master (PhotoUpdates* self) { result = _tmp0_; #line 37 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 946 "PhotoMonitor.c" +#line 1171 "PhotoMonitor.c" } -gboolean photo_updates_is_reimport_editable (PhotoUpdates* self) { +gboolean +photo_updates_is_reimport_editable (PhotoUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 40 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -957,11 +1184,13 @@ gboolean photo_updates_is_reimport_editable (PhotoUpdates* self) { result = _tmp0_; #line 41 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 961 "PhotoMonitor.c" +#line 1188 "PhotoMonitor.c" } -GFile* photo_updates_get_editable_file (PhotoUpdates* self) { +GFile* +photo_updates_get_editable_file (PhotoUpdates* self) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -975,11 +1204,13 @@ GFile* photo_updates_get_editable_file (PhotoUpdates* self) { result = _tmp1_; #line 45 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 979 "PhotoMonitor.c" +#line 1208 "PhotoMonitor.c" } -GFileInfo* photo_updates_get_editable_file_info (PhotoUpdates* self) { +GFileInfo* +photo_updates_get_editable_file_info (PhotoUpdates* self) +{ GFileInfo* result = NULL; GFileInfo* _tmp0_; GFileInfo* _tmp1_; @@ -993,11 +1224,13 @@ GFileInfo* photo_updates_get_editable_file_info (PhotoUpdates* self) { result = _tmp1_; #line 49 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 997 "PhotoMonitor.c" +#line 1228 "PhotoMonitor.c" } -GeeCollection* photo_updates_get_raw_developer_files (PhotoUpdates* self) { +GeeCollection* +photo_updates_get_raw_developer_files (PhotoUpdates* self) +{ GeeCollection* result = NULL; GeeCollection* _tmp0_; GeeCollection* _tmp1_; @@ -1011,41 +1244,42 @@ GeeCollection* photo_updates_get_raw_developer_files (PhotoUpdates* self) { result = _tmp1_; #line 53 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1015 "PhotoMonitor.c" +#line 1248 "PhotoMonitor.c" } -static gboolean photo_updates_real_is_in_alteration (MonitorableUpdates* base) { +static gboolean +photo_updates_real_is_in_alteration (MonitorableUpdates* base) +{ PhotoUpdates * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gboolean _tmp1_; #line 56 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_UPDATES, PhotoUpdates); #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = MONITORABLE_UPDATES_CLASS (photo_updates_parent_class)->is_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); -#line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_) { + if (MONITORABLE_UPDATES_CLASS (photo_updates_parent_class)->is_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates))) { #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = TRUE; -#line 1032 "PhotoMonitor.c" +#line 1264 "PhotoMonitor.c" } else { - gboolean _tmp2_; + gboolean _tmp1_; #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->editable_in_alteration; + _tmp1_ = self->editable_in_alteration; #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = _tmp2_; -#line 1039 "PhotoMonitor.c" + _tmp0_ = _tmp1_; +#line 1271 "PhotoMonitor.c" } #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = _tmp0_; #line 57 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1045 "PhotoMonitor.c" +#line 1277 "PhotoMonitor.c" } -gboolean photo_updates_is_revert_to_master (PhotoUpdates* self) { +gboolean +photo_updates_is_revert_to_master (PhotoUpdates* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 60 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -1056,225 +1290,230 @@ gboolean photo_updates_is_revert_to_master (PhotoUpdates* self) { result = _tmp0_; #line 61 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1060 "PhotoMonitor.c" +#line 1294 "PhotoMonitor.c" } -static void photo_updates_real_set_editable_file (PhotoUpdates* self, GFile* file) { +static void +photo_updates_real_set_editable_file (PhotoUpdates* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; - GFile* _tmp1_; - GFile* _tmp3_; - GFile* _tmp4_; + GFile* _tmp2_; #line 64 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail ((file == NULL) || G_IS_FILE (file)); #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = file; -#line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_ != NULL) { -#line 1075 "PhotoMonitor.c" - gboolean _tmp2_; + if (file != NULL) { +#line 1308 "PhotoMonitor.c" + gboolean _tmp1_; #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->revert_to_master; + _tmp1_ = self->revert_to_master; #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = _tmp2_; -#line 1081 "PhotoMonitor.c" + _tmp0_ = _tmp1_; +#line 1314 "PhotoMonitor.c" } else { #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = FALSE; -#line 1085 "PhotoMonitor.c" +#line 1318 "PhotoMonitor.c" } #line 66 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp0_) { #line 67 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 1091 "PhotoMonitor.c" +#line 1324 "PhotoMonitor.c" } #line 69 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = file; -#line 69 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (file); #line 69 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (self->editable_file); #line 69 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->editable_file = _tmp4_; -#line 1101 "PhotoMonitor.c" + self->editable_file = _tmp2_; +#line 1332 "PhotoMonitor.c" } -void photo_updates_set_editable_file (PhotoUpdates* self, GFile* file) { +void +photo_updates_set_editable_file (PhotoUpdates* self, + GFile* file) +{ #line 64 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 64 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_editable_file (self, file); -#line 1110 "PhotoMonitor.c" +#line 1344 "PhotoMonitor.c" } -static void photo_updates_real_set_editable_file_info (PhotoUpdates* self, GFileInfo* info) { +static void +photo_updates_real_set_editable_file_info (PhotoUpdates* self, + GFileInfo* info) +{ gboolean _tmp0_ = FALSE; - GFileInfo* _tmp1_; - GFileInfo* _tmp3_; - GFileInfo* _tmp4_; - GFileInfo* _tmp5_; + GFileInfo* _tmp2_; #line 72 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = info; -#line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_ != NULL) { -#line 1126 "PhotoMonitor.c" - gboolean _tmp2_; + if (info != NULL) { +#line 1358 "PhotoMonitor.c" + gboolean _tmp1_; #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->revert_to_master; + _tmp1_ = self->revert_to_master; #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = _tmp2_; -#line 1132 "PhotoMonitor.c" + _tmp0_ = _tmp1_; +#line 1364 "PhotoMonitor.c" } else { #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = FALSE; -#line 1136 "PhotoMonitor.c" +#line 1368 "PhotoMonitor.c" } #line 74 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp0_) { #line 75 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 1142 "PhotoMonitor.c" +#line 1374 "PhotoMonitor.c" } #line 77 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = info; -#line 77 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (info); #line 77 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (self->editable_file_info); #line 77 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->editable_file_info = _tmp4_; + self->editable_file_info = _tmp2_; #line 78 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = info; -#line 78 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp5_ == NULL) { + if (info == NULL) { #line 79 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->editable_file_info_altered = FALSE; -#line 1158 "PhotoMonitor.c" +#line 1386 "PhotoMonitor.c" } } -void photo_updates_set_editable_file_info (PhotoUpdates* self, GFileInfo* info) { +void +photo_updates_set_editable_file_info (PhotoUpdates* self, + GFileInfo* info) +{ #line 72 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 72 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_editable_file_info (self, info); -#line 1168 "PhotoMonitor.c" +#line 1399 "PhotoMonitor.c" } -static void photo_updates_real_set_editable_file_info_altered (PhotoUpdates* self, gboolean altered) { +static void +photo_updates_real_set_editable_file_info_altered (PhotoUpdates* self, + gboolean altered) +{ gboolean _tmp0_ = FALSE; - gboolean _tmp1_; - gboolean _tmp3_; -#line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = altered; #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_) { -#line 1180 "PhotoMonitor.c" - gboolean _tmp2_; + if (altered) { +#line 1410 "PhotoMonitor.c" + gboolean _tmp1_; #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->revert_to_master; + _tmp1_ = self->revert_to_master; #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = _tmp2_; -#line 1186 "PhotoMonitor.c" + _tmp0_ = _tmp1_; +#line 1416 "PhotoMonitor.c" } else { #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = FALSE; -#line 1190 "PhotoMonitor.c" +#line 1420 "PhotoMonitor.c" } #line 84 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp0_) { #line 85 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 1196 "PhotoMonitor.c" +#line 1426 "PhotoMonitor.c" } #line 87 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = altered; -#line 87 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->editable_file_info_altered = _tmp3_; -#line 1202 "PhotoMonitor.c" + self->editable_file_info_altered = altered; +#line 1430 "PhotoMonitor.c" } -void photo_updates_set_editable_file_info_altered (PhotoUpdates* self, gboolean altered) { +void +photo_updates_set_editable_file_info_altered (PhotoUpdates* self, + gboolean altered) +{ #line 82 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 82 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_editable_file_info_altered (self, altered); -#line 1211 "PhotoMonitor.c" +#line 1442 "PhotoMonitor.c" } -static void photo_updates_real_set_editable_in_alteration (PhotoUpdates* self, gboolean in_alteration) { - gboolean _tmp0_; -#line 91 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = in_alteration; +static void +photo_updates_real_set_editable_in_alteration (PhotoUpdates* self, + gboolean in_alteration) +{ #line 91 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->editable_in_alteration = _tmp0_; -#line 1221 "PhotoMonitor.c" + self->editable_in_alteration = in_alteration; +#line 1452 "PhotoMonitor.c" } -void photo_updates_set_editable_in_alteration (PhotoUpdates* self, gboolean in_alteration) { +void +photo_updates_set_editable_in_alteration (PhotoUpdates* self, + gboolean in_alteration) +{ #line 90 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 90 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_editable_in_alteration (self, in_alteration); -#line 1230 "PhotoMonitor.c" +#line 1464 "PhotoMonitor.c" } -static void photo_updates_real_set_raw_development_in_alteration (PhotoUpdates* self, gboolean in_alteration) { - gboolean _tmp0_; -#line 95 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = in_alteration; +static void +photo_updates_real_set_raw_development_in_alteration (PhotoUpdates* self, + gboolean in_alteration) +{ #line 95 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->raw_development_in_alteration = _tmp0_; -#line 1240 "PhotoMonitor.c" + self->raw_development_in_alteration = in_alteration; +#line 1474 "PhotoMonitor.c" } -void photo_updates_set_raw_development_in_alteration (PhotoUpdates* self, gboolean in_alteration) { +void +photo_updates_set_raw_development_in_alteration (PhotoUpdates* self, + gboolean in_alteration) +{ #line 94 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 94 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_raw_development_in_alteration (self, in_alteration); -#line 1249 "PhotoMonitor.c" +#line 1486 "PhotoMonitor.c" } -static void photo_updates_real_set_raw_developer_file_info_altered (PhotoUpdates* self, gboolean altered) { - gboolean _tmp0_; -#line 99 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = altered; +static void +photo_updates_real_set_raw_developer_file_info_altered (PhotoUpdates* self, + gboolean altered) +{ #line 99 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->raw_developer_file_info_altered = _tmp0_; -#line 1259 "PhotoMonitor.c" + self->raw_developer_file_info_altered = altered; +#line 1496 "PhotoMonitor.c" } -void photo_updates_set_raw_developer_file_info_altered (PhotoUpdates* self, gboolean altered) { +void +photo_updates_set_raw_developer_file_info_altered (PhotoUpdates* self, + gboolean altered) +{ #line 98 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 98 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_raw_developer_file_info_altered (self, altered); -#line 1268 "PhotoMonitor.c" +#line 1508 "PhotoMonitor.c" } -static void photo_updates_real_set_revert_to_master (PhotoUpdates* self, gboolean revert) { - gboolean _tmp0_; - gboolean _tmp1_; -#line 103 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = revert; +static void +photo_updates_real_set_revert_to_master (PhotoUpdates* self, + gboolean revert) +{ #line 103 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp0_) { + if (revert) { #line 105 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->reimport_editable = FALSE; #line 106 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -1285,180 +1524,187 @@ static void photo_updates_real_set_revert_to_master (PhotoUpdates* self, gboolea _g_object_unref0 (self->editable_file_info); #line 107 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->editable_file_info = NULL; -#line 1289 "PhotoMonitor.c" +#line 1528 "PhotoMonitor.c" } #line 110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = revert; -#line 110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->revert_to_master = _tmp1_; -#line 1295 "PhotoMonitor.c" + self->revert_to_master = revert; +#line 1532 "PhotoMonitor.c" } -void photo_updates_set_revert_to_master (PhotoUpdates* self, gboolean revert) { +void +photo_updates_set_revert_to_master (PhotoUpdates* self, + gboolean revert) +{ #line 102 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 102 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_revert_to_master (self, revert); -#line 1304 "PhotoMonitor.c" +#line 1544 "PhotoMonitor.c" } -static void photo_updates_real_add_raw_developer_file (PhotoUpdates* self, GFile* file) { +static void +photo_updates_real_add_raw_developer_file (PhotoUpdates* self, + GFile* file) +{ GeeCollection* _tmp0_; - GFile* _tmp1_; #line 113 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 114 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = self->developer_files; #line 114 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = file; -#line 114 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_collection_add (_tmp0_, _tmp1_); -#line 1319 "PhotoMonitor.c" + gee_collection_add (_tmp0_, file); +#line 1559 "PhotoMonitor.c" } -void photo_updates_add_raw_developer_file (PhotoUpdates* self, GFile* file) { +void +photo_updates_add_raw_developer_file (PhotoUpdates* self, + GFile* file) +{ #line 113 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 113 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->add_raw_developer_file (self, file); -#line 1328 "PhotoMonitor.c" +#line 1571 "PhotoMonitor.c" } -static void photo_updates_real_clear_raw_developer_files (PhotoUpdates* self) { +static void +photo_updates_real_clear_raw_developer_files (PhotoUpdates* self) +{ GeeCollection* _tmp0_; #line 118 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = self->developer_files; #line 118 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" gee_collection_clear (_tmp0_); -#line 1338 "PhotoMonitor.c" +#line 1583 "PhotoMonitor.c" } -void photo_updates_clear_raw_developer_files (PhotoUpdates* self) { +void +photo_updates_clear_raw_developer_files (PhotoUpdates* self) +{ #line 117 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 117 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->clear_raw_developer_files (self); -#line 1347 "PhotoMonitor.c" +#line 1594 "PhotoMonitor.c" } -static void photo_updates_real_set_reimport_master (PhotoUpdates* self, gboolean reimport) { - gboolean _tmp0_; - gboolean _tmp1_; -#line 122 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = reimport; +static void +photo_updates_real_set_reimport_master (PhotoUpdates* self, + gboolean reimport) +{ #line 122 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->reimport_master = _tmp0_; -#line 124 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = reimport; + self->reimport_master = reimport; #line 124 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_) { + if (reimport) { #line 125 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" monitorable_updates_mark_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); -#line 1364 "PhotoMonitor.c" +#line 1608 "PhotoMonitor.c" } } -void photo_updates_set_reimport_master (PhotoUpdates* self, gboolean reimport) { +void +photo_updates_set_reimport_master (PhotoUpdates* self, + gboolean reimport) +{ #line 121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_reimport_master (self, reimport); -#line 1374 "PhotoMonitor.c" +#line 1621 "PhotoMonitor.c" } -static void photo_updates_real_set_reimport_editable (PhotoUpdates* self, gboolean reimport) { +static void +photo_updates_real_set_reimport_editable (PhotoUpdates* self, + gboolean reimport) +{ gboolean _tmp0_ = FALSE; - gboolean _tmp1_; - gboolean _tmp5_; #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = reimport; -#line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_) { -#line 1386 "PhotoMonitor.c" - gboolean _tmp2_ = FALSE; - gboolean _tmp3_; + if (reimport) { +#line 1632 "PhotoMonitor.c" + gboolean _tmp1_ = FALSE; + gboolean _tmp2_; #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = self->revert_to_master; + _tmp2_ = self->revert_to_master; #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_) { + if (_tmp2_) { #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = TRUE; -#line 1395 "PhotoMonitor.c" + _tmp1_ = TRUE; +#line 1641 "PhotoMonitor.c" } else { - gboolean _tmp4_; #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = monitorable_updates_is_set_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); -#line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp4_; -#line 1402 "PhotoMonitor.c" + _tmp1_ = monitorable_updates_is_set_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); +#line 1645 "PhotoMonitor.c" } #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = _tmp2_; -#line 1406 "PhotoMonitor.c" + _tmp0_ = _tmp1_; +#line 1649 "PhotoMonitor.c" } else { #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = FALSE; -#line 1410 "PhotoMonitor.c" +#line 1653 "PhotoMonitor.c" } #line 130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp0_) { #line 131 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 1416 "PhotoMonitor.c" +#line 1659 "PhotoMonitor.c" } #line 133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = reimport; -#line 133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->reimport_editable = _tmp5_; -#line 1422 "PhotoMonitor.c" + self->reimport_editable = reimport; +#line 1663 "PhotoMonitor.c" } -void photo_updates_set_reimport_editable (PhotoUpdates* self, gboolean reimport) { +void +photo_updates_set_reimport_editable (PhotoUpdates* self, + gboolean reimport) +{ #line 128 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 128 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_reimport_editable (self, reimport); -#line 1431 "PhotoMonitor.c" +#line 1675 "PhotoMonitor.c" } -static void photo_updates_real_set_reimport_raw_developments (PhotoUpdates* self, gboolean reimport) { - gboolean _tmp0_; - gboolean _tmp1_; -#line 137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = reimport; +static void +photo_updates_real_set_reimport_raw_developments (PhotoUpdates* self, + gboolean reimport) +{ #line 137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->reimport_raw_developments = _tmp0_; + self->reimport_raw_developments = reimport; #line 139 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = reimport; -#line 139 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp1_) { + if (reimport) { #line 140 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" monitorable_updates_mark_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); -#line 1448 "PhotoMonitor.c" +#line 1689 "PhotoMonitor.c" } } -void photo_updates_set_reimport_raw_developments (PhotoUpdates* self, gboolean reimport) { +void +photo_updates_set_reimport_raw_developments (PhotoUpdates* self, + gboolean reimport) +{ #line 136 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_UPDATES (self)); #line 136 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" PHOTO_UPDATES_GET_CLASS (self)->set_reimport_raw_developments (self, reimport); -#line 1458 "PhotoMonitor.c" +#line 1702 "PhotoMonitor.c" } -static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) { +static gboolean +photo_updates_real_is_all_updated (MonitorableUpdates* base) +{ PhotoUpdates * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -1470,152 +1716,151 @@ static gboolean photo_updates_real_is_all_updated (MonitorableUpdates* base) { gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; - gboolean _tmp9_; #line 143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_UPDATES, PhotoUpdates); #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = MONITORABLE_UPDATES_CLASS (photo_updates_parent_class)->is_all_updated (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); -#line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp9_) { -#line 1481 "PhotoMonitor.c" - gboolean _tmp10_; + if (MONITORABLE_UPDATES_CLASS (photo_updates_parent_class)->is_all_updated (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates))) { +#line 1724 "PhotoMonitor.c" + gboolean _tmp9_; #line 145 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = self->reimport_master; + _tmp9_ = self->reimport_master; #line 145 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = _tmp10_ == FALSE; -#line 1487 "PhotoMonitor.c" + _tmp8_ = _tmp9_ == FALSE; +#line 1730 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp8_ = FALSE; -#line 1491 "PhotoMonitor.c" +#line 1734 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp8_) { -#line 1495 "PhotoMonitor.c" - gboolean _tmp11_; +#line 1738 "PhotoMonitor.c" + gboolean _tmp10_; #line 146 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = self->reimport_editable; + _tmp10_ = self->reimport_editable; #line 146 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp11_ == FALSE; -#line 1501 "PhotoMonitor.c" + _tmp7_ = _tmp10_ == FALSE; +#line 1744 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp7_ = FALSE; -#line 1505 "PhotoMonitor.c" +#line 1748 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp7_) { -#line 1509 "PhotoMonitor.c" - GFile* _tmp12_; +#line 1752 "PhotoMonitor.c" + GFile* _tmp11_; #line 147 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = self->editable_file; + _tmp11_ = self->editable_file; #line 147 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _tmp12_ == NULL; -#line 1515 "PhotoMonitor.c" + _tmp6_ = _tmp11_ == NULL; +#line 1758 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp6_ = FALSE; -#line 1519 "PhotoMonitor.c" +#line 1762 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp6_) { -#line 1523 "PhotoMonitor.c" - gboolean _tmp13_; +#line 1766 "PhotoMonitor.c" + gboolean _tmp12_; #line 148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = self->editable_file_info_altered; + _tmp12_ = self->editable_file_info_altered; #line 148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = _tmp13_ == FALSE; -#line 1529 "PhotoMonitor.c" + _tmp5_ = _tmp12_ == FALSE; +#line 1772 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp5_ = FALSE; -#line 1533 "PhotoMonitor.c" +#line 1776 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp5_) { -#line 1537 "PhotoMonitor.c" - GFileInfo* _tmp14_; +#line 1780 "PhotoMonitor.c" + GFileInfo* _tmp13_; #line 149 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = self->editable_file_info; + _tmp13_ = self->editable_file_info; #line 149 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp14_ == NULL; -#line 1543 "PhotoMonitor.c" + _tmp4_ = _tmp13_ == NULL; +#line 1786 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp4_ = FALSE; -#line 1547 "PhotoMonitor.c" +#line 1790 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp4_) { -#line 1551 "PhotoMonitor.c" - gboolean _tmp15_; +#line 1794 "PhotoMonitor.c" + gboolean _tmp14_; #line 150 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = self->editable_in_alteration; + _tmp14_ = self->editable_in_alteration; #line 150 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp15_ == FALSE; -#line 1557 "PhotoMonitor.c" + _tmp3_ = _tmp14_ == FALSE; +#line 1800 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp3_ = FALSE; -#line 1561 "PhotoMonitor.c" +#line 1804 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp3_) { -#line 1565 "PhotoMonitor.c" - GeeCollection* _tmp16_; +#line 1808 "PhotoMonitor.c" + GeeCollection* _tmp15_; + gint _tmp16_; gint _tmp17_; - gint _tmp18_; #line 151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = self->developer_files; + _tmp15_ = self->developer_files; #line 151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = gee_collection_get_size (_tmp16_); + _tmp16_ = gee_collection_get_size (_tmp15_); #line 151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp18_ == 0; -#line 1577 "PhotoMonitor.c" + _tmp2_ = _tmp17_ == 0; +#line 1820 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp2_ = FALSE; -#line 1581 "PhotoMonitor.c" +#line 1824 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp2_) { -#line 1585 "PhotoMonitor.c" - gboolean _tmp19_; +#line 1828 "PhotoMonitor.c" + gboolean _tmp18_; #line 152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = self->raw_developer_file_info_altered; + _tmp18_ = self->raw_developer_file_info_altered; #line 152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = _tmp19_ == FALSE; -#line 1591 "PhotoMonitor.c" + _tmp1_ = _tmp18_ == FALSE; +#line 1834 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp1_ = FALSE; -#line 1595 "PhotoMonitor.c" +#line 1838 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_tmp1_) { -#line 1599 "PhotoMonitor.c" - gboolean _tmp20_; +#line 1842 "PhotoMonitor.c" + gboolean _tmp19_; #line 153 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = self->revert_to_master; + _tmp19_ = self->revert_to_master; #line 153 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = _tmp20_ == FALSE; -#line 1605 "PhotoMonitor.c" + _tmp0_ = _tmp19_ == FALSE; +#line 1848 "PhotoMonitor.c" } else { #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = FALSE; -#line 1609 "PhotoMonitor.c" +#line 1852 "PhotoMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = _tmp0_; #line 144 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1615 "PhotoMonitor.c" +#line 1858 "PhotoMonitor.c" } -static void photo_updates_class_init (PhotoUpdatesClass * klass) { +static void +photo_updates_class_init (PhotoUpdatesClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_updates_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -1650,11 +1895,13 @@ static void photo_updates_class_init (PhotoUpdatesClass * klass) { ((PhotoUpdatesClass *) klass)->set_reimport_raw_developments = (void (*) (PhotoUpdates *, gboolean)) photo_updates_real_set_reimport_raw_developments; #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*) (MonitorableUpdates *)) photo_updates_real_is_all_updated; -#line 1654 "PhotoMonitor.c" +#line 1899 "PhotoMonitor.c" } -static void photo_updates_instance_init (PhotoUpdates * self) { +static void +photo_updates_instance_init (PhotoUpdates * self) +{ GeeArrayList* _tmp0_; #line 10 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->reimport_master = FALSE; @@ -1680,11 +1927,13 @@ static void photo_updates_instance_init (PhotoUpdates * self) { _tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 20 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->developer_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1684 "PhotoMonitor.c" +#line 1931 "PhotoMonitor.c" } -static void photo_updates_finalize (MonitorableUpdates * obj) { +static void +photo_updates_finalize (MonitorableUpdates * obj) +{ PhotoUpdates * self; #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_UPDATES, PhotoUpdates); @@ -1698,11 +1947,13 @@ static void photo_updates_finalize (MonitorableUpdates * obj) { _g_object_unref0 (self->developer_files); #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" MONITORABLE_UPDATES_CLASS (photo_updates_parent_class)->finalize (obj); -#line 1702 "PhotoMonitor.c" +#line 1951 "PhotoMonitor.c" } -GType photo_updates_get_type (void) { +GType +photo_updates_get_type (void) +{ static volatile gsize photo_updates_type_id__volatile = 0; if (g_once_init_enter (&photo_updates_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoUpdatesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_updates_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoUpdates), 0, (GInstanceInitFunc) photo_updates_instance_init, NULL }; @@ -1714,19 +1965,23 @@ GType photo_updates_get_type (void) { } -static gpointer _workers_ref0 (gpointer self) { +static gpointer +_workers_ref0 (gpointer self) +{ #line 240 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self ? workers_ref (self) : NULL; -#line 1721 "PhotoMonitor.c" +#line 1974 "PhotoMonitor.c" } -PhotoMonitor* photo_monitor_construct (GType object_type, Workers* workers, GCancellable* cancellable) { +PhotoMonitor* +photo_monitor_construct (GType object_type, + Workers* workers, + GCancellable* cancellable) +{ PhotoMonitor * self = NULL; LibraryPhotoSourceCollection* _tmp0_; - GCancellable* _tmp1_; - Workers* _tmp2_; - Workers* _tmp3_; + Workers* _tmp1_; #line 237 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_WORKERS (workers), NULL); #line 237 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -1734,64 +1989,64 @@ PhotoMonitor* photo_monitor_construct (GType object_type, Workers* workers, GCan #line 238 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = library_photo_global; #line 238 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = cancellable; -#line 238 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self = (PhotoMonitor*) media_monitor_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp1_); -#line 240 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = workers; + self = (PhotoMonitor*) media_monitor_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), cancellable); #line 240 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _workers_ref0 (_tmp2_); + _tmp1_ = _workers_ref0 (workers); #line 240 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _workers_unref0 (self->priv->workers); #line 240 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->priv->workers = _tmp3_; + self->priv->workers = _tmp1_; #line 237 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self; -#line 1751 "PhotoMonitor.c" +#line 2002 "PhotoMonitor.c" } -PhotoMonitor* photo_monitor_new (Workers* workers, GCancellable* cancellable) { +PhotoMonitor* +photo_monitor_new (Workers* workers, + GCancellable* cancellable) +{ #line 237 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return photo_monitor_construct (TYPE_PHOTO_MONITOR, workers, cancellable); -#line 1758 "PhotoMonitor.c" +#line 2012 "PhotoMonitor.c" } -static MonitorableUpdates* photo_monitor_real_create_updates (MediaMonitor* base, Monitorable* monitorable) { +static MonitorableUpdates* +photo_monitor_real_create_updates (MediaMonitor* base, + Monitorable* monitorable) +{ PhotoMonitor * self; MonitorableUpdates* result = NULL; - Monitorable* _tmp0_; - Monitorable* _tmp1_; - PhotoUpdates* _tmp2_; + PhotoUpdates* _tmp0_; #line 243 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 243 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 244 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = monitorable; -#line 244 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO), "monitorable is LibraryPhoto"); -#line 246 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = monitorable; + _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (monitorable, TYPE_LIBRARY_PHOTO), "monitorable is LibraryPhoto"); #line 246 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_updates_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp0_ = photo_updates_new (G_TYPE_CHECK_INSTANCE_CAST (monitorable, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 246 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates); #line 246 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1784 "PhotoMonitor.c" +#line 2035 "PhotoMonitor.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 250 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self ? data_collection_ref (self) : NULL; -#line 1791 "PhotoMonitor.c" +#line 2044 "PhotoMonitor.c" } -static MediaSourceCollection* photo_monitor_real_get_media_source_collection (MediaMonitor* base) { +static MediaSourceCollection* +photo_monitor_real_get_media_source_collection (MediaMonitor* base) +{ PhotoMonitor * self; MediaSourceCollection* result = NULL; LibraryPhotoSourceCollection* _tmp0_; @@ -1806,48 +2061,50 @@ static MediaSourceCollection* photo_monitor_real_get_media_source_collection (Me result = _tmp1_; #line 250 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1810 "PhotoMonitor.c" +#line 2065 "PhotoMonitor.c" } -static gboolean photo_monitor_real_is_file_represented (MediaMonitor* base, GFile* file) { +static gboolean +photo_monitor_real_is_file_represented (MediaMonitor* base, + GFile* file) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState state = 0; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - gboolean _tmp4_; + gboolean _tmp3_; #line 253 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 253 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; -#line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; + state = _tmp0_; #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp3_ != NULL; + _tmp3_ = _tmp2_ != NULL; #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = _tmp4_; + result = _tmp3_; #line 255 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 1843 "PhotoMonitor.c" +#line 2098 "PhotoMonitor.c" } -static void photo_monitor_real_close (MediaMonitor* base) { +static void +photo_monitor_real_close (MediaMonitor* base) +{ PhotoMonitor * self; #line 258 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); -#line 1851 "PhotoMonitor.c" +#line 2108 "PhotoMonitor.c" { GeeIterator* _job_it = NULL; GeeHashMap* _tmp0_; @@ -1874,180 +2131,172 @@ static void photo_monitor_real_close (MediaMonitor* base) { _job_it = _tmp5_; #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 1878 "PhotoMonitor.c" +#line 2135 "PhotoMonitor.c" GeeIterator* _tmp6_; - gboolean _tmp7_; PhotoMonitorReimportMasterJob* job = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - PhotoMonitorReimportMasterJob* _tmp10_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + PhotoMonitorReimportMasterJob* _tmp9_; #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp6_ = _job_it; #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 1893 "PhotoMonitor.c" +#line 2147 "PhotoMonitor.c" } #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = _job_it; + _tmp7_ = _job_it; #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = (PhotoMonitorReimportMasterJob*) _tmp9_; + job = (PhotoMonitorReimportMasterJob*) _tmp8_; #line 260 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = job; + _tmp9_ = job; #line 260 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); -#line 1907 "PhotoMonitor.c" +#line 2161 "PhotoMonitor.c" } #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_job_it); -#line 1911 "PhotoMonitor.c" +#line 2165 "PhotoMonitor.c" } { GeeIterator* _job_it = NULL; - GeeHashMap* _tmp11_; + GeeHashMap* _tmp10_; + GeeCollection* _tmp11_; GeeCollection* _tmp12_; GeeCollection* _tmp13_; - GeeCollection* _tmp14_; + GeeIterator* _tmp14_; GeeIterator* _tmp15_; - GeeIterator* _tmp16_; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = self->priv->editable_reimport_pending; + _tmp10_ = self->priv->editable_reimport_pending; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp11_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp13_); #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _job_it = _tmp16_; + _job_it = _tmp15_; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 1939 "PhotoMonitor.c" - GeeIterator* _tmp17_; - gboolean _tmp18_; +#line 2193 "PhotoMonitor.c" + GeeIterator* _tmp16_; PhotoMonitorReimportEditableJob* job = NULL; - GeeIterator* _tmp19_; - gpointer _tmp20_; - PhotoMonitorReimportEditableJob* _tmp21_; -#line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _job_it; + GeeIterator* _tmp17_; + gpointer _tmp18_; + PhotoMonitorReimportEditableJob* _tmp19_; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = gee_iterator_next (_tmp17_); + _tmp16_ = _job_it; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp18_) { + if (!gee_iterator_next (_tmp16_)) { #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 1954 "PhotoMonitor.c" +#line 2205 "PhotoMonitor.c" } #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = _job_it; + _tmp17_ = _job_it; #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = gee_iterator_get (_tmp19_); + _tmp18_ = gee_iterator_get (_tmp17_); #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = (PhotoMonitorReimportEditableJob*) _tmp20_; + job = (PhotoMonitorReimportEditableJob*) _tmp18_; #line 263 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = job; + _tmp19_ = job; #line 263 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); -#line 1968 "PhotoMonitor.c" +#line 2219 "PhotoMonitor.c" } #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_job_it); -#line 1972 "PhotoMonitor.c" +#line 2223 "PhotoMonitor.c" } { GeeIterator* _job_it = NULL; - GeeHashMap* _tmp22_; + GeeHashMap* _tmp20_; + GeeCollection* _tmp21_; + GeeCollection* _tmp22_; GeeCollection* _tmp23_; - GeeCollection* _tmp24_; - GeeCollection* _tmp25_; - GeeIterator* _tmp26_; - GeeIterator* _tmp27_; + GeeIterator* _tmp24_; + GeeIterator* _tmp25_; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = self->priv->raw_developments_reimport_pending; + _tmp20_ = self->priv->raw_developments_reimport_pending; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp21_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable)); #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = _tmp26_; + _tmp25_ = _tmp24_; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp23_); #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _job_it = _tmp27_; + _job_it = _tmp25_; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 2000 "PhotoMonitor.c" - GeeIterator* _tmp28_; - gboolean _tmp29_; +#line 2251 "PhotoMonitor.c" + GeeIterator* _tmp26_; PhotoMonitorReimportRawDevelopmentJob* job = NULL; - GeeIterator* _tmp30_; - gpointer _tmp31_; - PhotoMonitorReimportRawDevelopmentJob* _tmp32_; -#line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = _job_it; + GeeIterator* _tmp27_; + gpointer _tmp28_; + PhotoMonitorReimportRawDevelopmentJob* _tmp29_; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = gee_iterator_next (_tmp28_); + _tmp26_ = _job_it; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp29_) { + if (!gee_iterator_next (_tmp26_)) { #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 2015 "PhotoMonitor.c" +#line 2263 "PhotoMonitor.c" } #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = _job_it; + _tmp27_ = _job_it; #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = gee_iterator_get (_tmp30_); + _tmp28_ = gee_iterator_get (_tmp27_); #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = (PhotoMonitorReimportRawDevelopmentJob*) _tmp31_; + job = (PhotoMonitorReimportRawDevelopmentJob*) _tmp28_; #line 266 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = job; + _tmp29_ = job; #line 266 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); -#line 2029 "PhotoMonitor.c" +#line 2277 "PhotoMonitor.c" } #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_job_it); -#line 2033 "PhotoMonitor.c" +#line 2281 "PhotoMonitor.c" } #line 268 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" MEDIA_MONITOR_CLASS (photo_monitor_parent_class)->close (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor)); -#line 2037 "PhotoMonitor.c" +#line 2285 "PhotoMonitor.c" } -static void photo_monitor_cancel_reimports (PhotoMonitor* self, LibraryPhoto* photo) { +static void +photo_monitor_cancel_reimports (PhotoMonitor* self, + LibraryPhoto* photo) +{ PhotoMonitorReimportMasterJob* master_job = NULL; GeeHashMap* _tmp0_; - LibraryPhoto* _tmp1_; - gpointer _tmp2_; - PhotoMonitorReimportMasterJob* _tmp3_; + gpointer _tmp1_; + PhotoMonitorReimportMasterJob* _tmp2_; PhotoMonitorReimportEditableJob* editable_job = NULL; - GeeHashMap* _tmp5_; - LibraryPhoto* _tmp6_; - gpointer _tmp7_; - PhotoMonitorReimportEditableJob* _tmp8_; + GeeHashMap* _tmp4_; + gpointer _tmp5_; + PhotoMonitorReimportEditableJob* _tmp6_; #line 271 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 271 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2055,62 +2304,62 @@ static void photo_monitor_cancel_reimports (PhotoMonitor* self, LibraryPhoto* ph #line 272 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = self->priv->master_reimport_pending; #line 272 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo; -#line 272 "/home/jens/Source/shotwell/src/PhotoMonitor.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), photo); #line 272 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - master_job = (PhotoMonitorReimportMasterJob*) _tmp2_; + master_job = (PhotoMonitorReimportMasterJob*) _tmp1_; #line 273 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = master_job; + _tmp2_ = master_job; #line 273 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ != NULL) { -#line 2068 "PhotoMonitor.c" - PhotoMonitorReimportMasterJob* _tmp4_; + if (_tmp2_ != NULL) { +#line 2315 "PhotoMonitor.c" + PhotoMonitorReimportMasterJob* _tmp3_; #line 274 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = master_job; + _tmp3_ = master_job; #line 274 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 2074 "PhotoMonitor.c" + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_BACKGROUND_JOB, BackgroundJob)); +#line 2321 "PhotoMonitor.c" } #line 276 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = self->priv->editable_reimport_pending; + _tmp4_ = self->priv->editable_reimport_pending; #line 276 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = photo; -#line 276 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_); + _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 276 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - editable_job = (PhotoMonitorReimportEditableJob*) _tmp7_; + editable_job = (PhotoMonitorReimportEditableJob*) _tmp5_; #line 277 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = editable_job; + _tmp6_ = editable_job; #line 277 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp8_ != NULL) { -#line 2088 "PhotoMonitor.c" - PhotoMonitorReimportEditableJob* _tmp9_; + if (_tmp6_ != NULL) { +#line 2333 "PhotoMonitor.c" + PhotoMonitorReimportEditableJob* _tmp7_; #line 278 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = editable_job; + _tmp7_ = editable_job; #line 278 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 2094 "PhotoMonitor.c" + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_BACKGROUND_JOB, BackgroundJob)); +#line 2339 "PhotoMonitor.c" } #line 271 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (editable_job); #line 271 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (master_job); -#line 2100 "PhotoMonitor.c" +#line 2345 "PhotoMonitor.c" } -static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable* * monitorable) { +static MediaMonitorDiscoveredFile +photo_monitor_real_notify_file_discovered (MediaMonitor* base, + GFile* file, + GFileInfo* info, + Monitorable* * monitorable) +{ PhotoMonitor * self; Monitorable* _vala_monitorable = NULL; MediaMonitorDiscoveredFile result = 0; LibraryPhotoSourceCollectionState state = 0; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_; + LibraryPhotoSourceCollectionState _tmp3_; #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2118,17 +2367,15 @@ static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (Med #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), 0); #line 284 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 284 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + state = _tmp0_; #line 284 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; -#line 284 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp2_; + photo = _tmp1_; #line 285 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; + _tmp2_ = photo; #line 285 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 286 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); #line 286 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2141,36 +2388,36 @@ static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (Med if (monitorable) { #line 288 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *monitorable = _vala_monitorable; -#line 2145 "PhotoMonitor.c" +#line 2392 "PhotoMonitor.c" } else { #line 288 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); -#line 2149 "PhotoMonitor.c" +#line 2396 "PhotoMonitor.c" } #line 288 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2153 "PhotoMonitor.c" +#line 2400 "PhotoMonitor.c" } #line 291 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = state; + _tmp3_ = state; #line 291 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 291 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 291 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 2163 "PhotoMonitor.c" +#line 2410 "PhotoMonitor.c" { - LibraryPhoto* _tmp5_; - Monitorable* _tmp6_; + LibraryPhoto* _tmp4_; + Monitorable* _tmp5_; #line 294 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; + _tmp4_ = photo; #line 294 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MONITORABLE, Monitorable)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MONITORABLE, Monitorable)); #line 294 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); #line 294 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_monitorable = _tmp6_; + _vala_monitorable = _tmp5_; #line 296 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED; #line 296 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2179,15 +2426,15 @@ static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (Med if (monitorable) { #line 296 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *monitorable = _vala_monitorable; -#line 2183 "PhotoMonitor.c" +#line 2430 "PhotoMonitor.c" } else { #line 296 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); -#line 2187 "PhotoMonitor.c" +#line 2434 "PhotoMonitor.c" } #line 296 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2191 "PhotoMonitor.c" +#line 2438 "PhotoMonitor.c" } default: #line 291 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2196,7 +2443,7 @@ static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (Med case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: #line 291 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 2200 "PhotoMonitor.c" +#line 2447 "PhotoMonitor.c" { #line 304 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); @@ -2210,15 +2457,15 @@ static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (Med if (monitorable) { #line 306 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *monitorable = _vala_monitorable; -#line 2214 "PhotoMonitor.c" +#line 2461 "PhotoMonitor.c" } else { #line 306 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); -#line 2218 "PhotoMonitor.c" +#line 2465 "PhotoMonitor.c" } #line 306 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2222 "PhotoMonitor.c" +#line 2469 "PhotoMonitor.c" } } #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2227,16 +2474,21 @@ static MediaMonitorDiscoveredFile photo_monitor_real_notify_file_discovered (Med if (monitorable) { #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *monitorable = _vala_monitorable; -#line 2231 "PhotoMonitor.c" +#line 2478 "PhotoMonitor.c" } else { #line 281 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_vala_monitorable); -#line 2235 "PhotoMonitor.c" +#line 2482 "PhotoMonitor.c" } } -static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonitor* base, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_) { +static GeeCollection* +photo_monitor_real_candidates_for_unknown_file (MediaMonitor* base, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_) +{ PhotoMonitor * self; MediaMonitorDiscoveredFile _vala_result = 0; GeeCollection* result = NULL; @@ -2245,23 +2497,22 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit GeeCollection* matched_masters = NULL; GeeArrayList* _tmp2_; LibraryPhotoSourceCollection* _tmp3_; - GFileInfo* _tmp4_; - GeeCollection* _tmp5_; + GeeCollection* _tmp4_; + GeeArrayList* _tmp5_; GeeArrayList* _tmp6_; - GeeArrayList* _tmp7_; - GeeCollection* _tmp8_; + GeeCollection* _tmp7_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; - gboolean _tmp11_ = FALSE; - GeeArrayList* _tmp12_; + gboolean _tmp10_ = FALSE; + GeeArrayList* _tmp11_; + gint _tmp12_; gint _tmp13_; - gint _tmp14_; - GeeArrayList* _tmp18_; + GeeArrayList* _tmp17_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; - GeeArrayList* _tmp53_; - gint _tmp54_; - gint _tmp55_; + GeeArrayList* _tmp49_; + gint _tmp50_; + gint _tmp51_; #line 310 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 310 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2283,23 +2534,21 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit #line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp3_ = library_photo_global; #line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = info; + _tmp4_ = matched_masters; #line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = matched_masters; + _tmp5_ = self->priv->matched_editables; #line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = self->priv->matched_editables; + _tmp6_ = self->priv->matched_developments; #line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = self->priv->matched_developments; -#line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - library_photo_source_collection_fetch_by_matching_backing (_tmp3_, _tmp4_, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + library_photo_source_collection_fetch_by_matching_backing (_tmp3_, info, _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); #line 319 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = matched_masters; + _tmp7_ = matched_masters; #line 319 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = gee_collection_get_size (_tmp8_); + _tmp8_ = gee_collection_get_size (_tmp7_); #line 319 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 319 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp10_ > 0) { + if (_tmp9_ > 0) { #line 320 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_result = MEDIA_MONITOR_DISCOVERED_FILE_UNKNOWN; #line 322 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2308,40 +2557,40 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit if (_result_) { #line 322 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *_result_ = _vala_result; -#line 2312 "PhotoMonitor.c" +#line 2561 "PhotoMonitor.c" } #line 322 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2316 "PhotoMonitor.c" +#line 2565 "PhotoMonitor.c" } #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = self->priv->matched_editables; + _tmp11_ = self->priv->matched_editables; #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp14_ == 0) { -#line 2326 "PhotoMonitor.c" - GeeArrayList* _tmp15_; + if (_tmp13_ == 0) { +#line 2575 "PhotoMonitor.c" + GeeArrayList* _tmp14_; + gint _tmp15_; gint _tmp16_; - gint _tmp17_; #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = self->priv->matched_developments; + _tmp14_ = self->priv->matched_developments; #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = _tmp17_ == 0; -#line 2338 "PhotoMonitor.c" + _tmp10_ = _tmp16_ == 0; +#line 2587 "PhotoMonitor.c" } else { #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = FALSE; -#line 2342 "PhotoMonitor.c" + _tmp10_ = FALSE; +#line 2591 "PhotoMonitor.c" } #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp11_) { + if (_tmp10_) { #line 326 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_result = MEDIA_MONITOR_DISCOVERED_FILE_UNKNOWN; #line 328 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2352,253 +2601,238 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit if (_result_) { #line 328 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *_result_ = _vala_result; -#line 2356 "PhotoMonitor.c" +#line 2605 "PhotoMonitor.c" } #line 328 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2360 "PhotoMonitor.c" +#line 2609 "PhotoMonitor.c" } #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = self->priv->matched_editables; + _tmp17_ = self->priv->matched_editables; #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp20_ > 0) { -#line 2370 "PhotoMonitor.c" + if (_tmp19_ > 0) { +#line 2619 "PhotoMonitor.c" LibraryPhoto* match = NULL; - GeeArrayList* _tmp21_; - gpointer _tmp22_; - GeeArrayList* _tmp23_; + GeeArrayList* _tmp20_; + gpointer _tmp21_; + GeeArrayList* _tmp22_; + gint _tmp23_; gint _tmp24_; - gint _tmp25_; - LibraryPhoto* _tmp51_; - GFile* _tmp52_; + LibraryPhoto* _tmp48_; #line 333 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = self->priv->matched_editables; + _tmp20_ = self->priv->matched_editables; #line 333 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp21_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 333 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - match = (LibraryPhoto*) _tmp22_; + match = (LibraryPhoto*) _tmp21_; #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = self->priv->matched_editables; + _tmp22_ = self->priv->matched_editables; #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = _tmp24_; + _tmp24_ = _tmp23_; #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp25_ > 1) { -#line 2393 "PhotoMonitor.c" - GFile* _tmp26_; - gchar* _tmp27_; - gchar* _tmp28_; - GeeArrayList* _tmp29_; - gint _tmp30_; - gint _tmp31_; - LibraryPhoto* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; -#line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = file; + if (_tmp24_ > 1) { +#line 2641 "PhotoMonitor.c" + gchar* _tmp25_; + gchar* _tmp26_; + GeeArrayList* _tmp27_; + gint _tmp28_; + gint _tmp29_; + LibraryPhoto* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = g_file_get_path (_tmp26_); + _tmp25_ = g_file_get_path (file); #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = self->priv->matched_editables; + _tmp27_ = self->priv->matched_editables; #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = _tmp30_; + _tmp29_ = _tmp28_; #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = match; + _tmp30_ = match; #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject)); + _tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_OBJECT, DataObject)); #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp34_ = _tmp33_; + _tmp32_ = _tmp31_; #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_warning ("PhotoMonitor.vala:335: Unknown file %s could be matched with %d photos" \ -"; giving to %s, dropping others", _tmp28_, _tmp31_, _tmp34_); +"; giving to %s, dropping others", _tmp26_, _tmp29_, _tmp32_); #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp32_); #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp28_); -#line 2427 "PhotoMonitor.c" + _g_free0 (_tmp26_); +#line 2672 "PhotoMonitor.c" { gint ctr = 0; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ctr = 1; -#line 2432 "PhotoMonitor.c" +#line 2677 "PhotoMonitor.c" { - gboolean _tmp35_ = FALSE; + gboolean _tmp33_ = FALSE; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = TRUE; + _tmp33_ = TRUE; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 2439 "PhotoMonitor.c" +#line 2684 "PhotoMonitor.c" + gint _tmp35_; + GeeArrayList* _tmp36_; gint _tmp37_; - GeeArrayList* _tmp38_; - gint _tmp39_; + gint _tmp38_; + GeeArrayList* _tmp39_; gint _tmp40_; - GeeArrayList* _tmp41_; - gint _tmp42_; - gpointer _tmp43_; - LibraryPhoto* _tmp44_; - gboolean _tmp45_; - gboolean _tmp46_; + gpointer _tmp41_; + LibraryPhoto* _tmp42_; + gboolean _tmp43_; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp35_) { -#line 2452 "PhotoMonitor.c" - gint _tmp36_; + if (!_tmp33_) { +#line 2696 "PhotoMonitor.c" + gint _tmp34_; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp36_ = ctr; + _tmp34_ = ctr; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - ctr = _tmp36_ + 1; -#line 2458 "PhotoMonitor.c" + ctr = _tmp34_ + 1; +#line 2702 "PhotoMonitor.c" } #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = FALSE; + _tmp33_ = FALSE; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp37_ = ctr; + _tmp35_ = ctr; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp38_ = self->priv->matched_editables; + _tmp36_ = self->priv->matched_editables; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp40_ = _tmp39_; + _tmp38_ = _tmp37_; #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!(_tmp37_ < _tmp40_)) { + if (!(_tmp35_ < _tmp38_)) { #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 2474 "PhotoMonitor.c" +#line 2718 "PhotoMonitor.c" } #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp41_ = self->priv->matched_editables; + _tmp39_ = self->priv->matched_editables; #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp42_ = ctr; + _tmp40_ = ctr; #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp43_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp42_); + _tmp41_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp40_); #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp44_ = (LibraryPhoto*) _tmp43_; + _tmp42_ = (LibraryPhoto*) _tmp41_; #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp45_ = photo_does_editable_exist (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_PHOTO, Photo)); + _tmp43_ = !photo_does_editable_exist (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PHOTO, Photo)); #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp46_ = !_tmp45_; + _g_object_unref0 (_tmp42_); #line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp44_); -#line 338 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp46_) { -#line 2492 "PhotoMonitor.c" - GeeArrayList* _tmp47_; - gint _tmp48_; - gpointer _tmp49_; - LibraryPhoto* _tmp50_; + if (_tmp43_) { +#line 2734 "PhotoMonitor.c" + GeeArrayList* _tmp44_; + gint _tmp45_; + gpointer _tmp46_; + LibraryPhoto* _tmp47_; #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp47_ = self->priv->matched_editables; + _tmp44_ = self->priv->matched_editables; #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp48_ = ctr; + _tmp45_ = ctr; #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp49_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp48_); + _tmp46_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp45_); #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp50_ = (LibraryPhoto*) _tmp49_; + _tmp47_ = (LibraryPhoto*) _tmp46_; #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_PHOTO, Photo), TRUE); + photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO, Photo), TRUE); #line 339 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp50_); -#line 2509 "PhotoMonitor.c" + _g_object_unref0 (_tmp47_); +#line 2751 "PhotoMonitor.c" } } } } } #line 343 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp51_ = match; + _tmp48_ = match; #line 343 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp52_ = file; -#line 343 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file (self, _tmp51_, _tmp52_); + photo_monitor_update_editable_file (self, _tmp48_, file); #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (match); -#line 2523 "PhotoMonitor.c" +#line 2763 "PhotoMonitor.c" } #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp53_ = self->priv->matched_developments; + _tmp49_ = self->priv->matched_developments; #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp50_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp55_ = _tmp54_; + _tmp51_ = _tmp50_; #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp55_ > 0) { -#line 2533 "PhotoMonitor.c" + if (_tmp51_ > 0) { +#line 2773 "PhotoMonitor.c" LibraryPhoto* match_raw = NULL; - GeeArrayList* _tmp56_; - gpointer _tmp57_; - GeeArrayList* _tmp58_; - gint _tmp59_; - gint _tmp60_; - LibraryPhoto* _tmp70_; - GFile* _tmp71_; + GeeArrayList* _tmp52_; + gpointer _tmp53_; + GeeArrayList* _tmp54_; + gint _tmp55_; + gint _tmp56_; + LibraryPhoto* _tmp65_; #line 347 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp56_ = self->priv->matched_developments; + _tmp52_ = self->priv->matched_developments; #line 347 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp57_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp53_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 347 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - match_raw = (LibraryPhoto*) _tmp57_; + match_raw = (LibraryPhoto*) _tmp53_; #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp58_ = self->priv->matched_developments; + _tmp54_ = self->priv->matched_developments; #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp59_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp55_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp60_ = _tmp59_; + _tmp56_ = _tmp55_; #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp60_ > 1) { -#line 2556 "PhotoMonitor.c" - GFile* _tmp61_; - gchar* _tmp62_; + if (_tmp56_ > 1) { +#line 2795 "PhotoMonitor.c" + gchar* _tmp57_; + gchar* _tmp58_; + GeeArrayList* _tmp59_; + gint _tmp60_; + gint _tmp61_; + LibraryPhoto* _tmp62_; gchar* _tmp63_; - GeeArrayList* _tmp64_; - gint _tmp65_; - gint _tmp66_; - LibraryPhoto* _tmp67_; - gchar* _tmp68_; - gchar* _tmp69_; -#line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp61_ = file; + gchar* _tmp64_; #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp62_ = g_file_get_path (_tmp61_); + _tmp57_ = g_file_get_path (file); #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp63_ = _tmp62_; + _tmp58_ = _tmp57_; #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp64_ = self->priv->matched_developments; + _tmp59_ = self->priv->matched_developments; #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp65_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp60_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp66_ = _tmp65_; + _tmp61_ = _tmp60_; #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp67_ = match_raw; + _tmp62_ = match_raw; #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp68_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_DATA_OBJECT, DataObject)); + _tmp63_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_DATA_OBJECT, DataObject)); #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp69_ = _tmp68_; + _tmp64_ = _tmp63_; #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_warning ("PhotoMonitor.vala:349: Unknown file %s could be matched with %d photos" \ -"; giving to %s, dropping others", _tmp63_, _tmp66_, _tmp69_); +"; giving to %s, dropping others", _tmp58_, _tmp61_, _tmp64_); #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp69_); + _g_free0 (_tmp64_); #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp63_); -#line 2590 "PhotoMonitor.c" + _g_free0 (_tmp58_); +#line 2826 "PhotoMonitor.c" } #line 353 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp70_ = match_raw; + _tmp65_ = match_raw; #line 353 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp71_ = file; -#line 353 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file (self, _tmp70_, _tmp71_); + photo_monitor_update_raw_development_file (self, _tmp65_, file); #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (match_raw); -#line 2600 "PhotoMonitor.c" +#line 2834 "PhotoMonitor.c" } #line 356 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_result = MEDIA_MONITOR_DISCOVERED_FILE_IGNORE; @@ -2610,248 +2844,256 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit if (_result_) { #line 358 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *_result_ = _vala_result; -#line 2612 "PhotoMonitor.c" +#line 2846 "PhotoMonitor.c" } #line 358 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2616 "PhotoMonitor.c" +#line 2850 "PhotoMonitor.c" } -static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* value) { +static void +_vala_array_add132 (GFile** * array, + int* length, + int* size, + GFile* value) +{ #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if ((*length) == (*size)) { #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *size = (*size) ? (2 * (*size)) : 4; #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 2627 "PhotoMonitor.c" +#line 2866 "PhotoMonitor.c" } #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" (*array)[(*length)++] = value; #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" (*array)[*length] = NULL; -#line 2633 "PhotoMonitor.c" +#line 2872 "PhotoMonitor.c" } -static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* value) { +static void +_vala_array_add133 (GFile** * array, + int* length, + int* size, + GFile* value) +{ #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if ((*length) == (*size)) { #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *size = (*size) ? (2 * (*size)) : 4; #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 2644 "PhotoMonitor.c" +#line 2888 "PhotoMonitor.c" } #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" (*array)[(*length)++] = value; #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" (*array)[*length] = NULL; -#line 2650 "PhotoMonitor.c" +#line 2894 "PhotoMonitor.c" } -static GFile** _vala_array_dup31 (GFile** self, int length) { +static GFile** +_vala_array_dup26 (GFile** self, + int length) +{ GFile** result; int i; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = g_new0 (GFile*, length + 1); #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" for (i = 0; i < length; i++) { -#line 2661 "PhotoMonitor.c" +#line 2908 "PhotoMonitor.c" GFile* _tmp0_; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result[i] = _tmp0_; -#line 2667 "PhotoMonitor.c" +#line 2914 "PhotoMonitor.c" } #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2671 "PhotoMonitor.c" +#line 2918 "PhotoMonitor.c" } -static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, Monitorable* monitorable, int* result_length1) { +static GFile** +photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, + Monitorable* monitorable, + int* result_length1) +{ PhotoMonitor * self; GFile** result = NULL; LibraryPhoto* photo = NULL; - Monitorable* _tmp0_; - LibraryPhoto* _tmp1_; + LibraryPhoto* _tmp0_; GFile** files = NULL; - GFile** _tmp2_; + GFile** _tmp1_; gint files_length1; gint _files_size_; - LibraryPhoto* _tmp3_; - gboolean _tmp4_; + LibraryPhoto* _tmp2_; GeeCollection* raw_files = NULL; - LibraryPhoto* _tmp8_; - GeeCollection* _tmp9_; - GeeCollection* _tmp10_; - GFile** _tmp20_ = NULL; - gint _tmp20__length1 = 0; - gint __tmp20__size_ = 0; + LibraryPhoto* _tmp6_; + GeeCollection* _tmp7_; + GeeCollection* _tmp8_; + GFile** _tmp17_ = NULL; + gint _tmp17__length1 = 0; + gint __tmp17__size_ = 0; + GFile** _tmp18_; + gint _tmp18__length1; + GFile** _tmp20_; + gint _tmp20__length1; GFile** _tmp21_; gint _tmp21__length1; - GFile** _tmp23_; - gint _tmp23__length1; - GFile** _tmp24_; - gint _tmp24__length1; #line 361 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 361 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 362 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = monitorable; -#line 362 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (monitorable, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 362 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp1_; + photo = _tmp0_; #line 363 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = g_new0 (GFile*, 0 + 1); + _tmp1_ = g_new0 (GFile*, 0 + 1); #line 363 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - files = _tmp2_; + files = _tmp1_; #line 363 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" files_length1 = 0; #line 363 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _files_size_ = files_length1; #line 366 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; -#line 366 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo)); + _tmp2_ = photo; #line 366 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp4_) { -#line 2724 "PhotoMonitor.c" - GFile** _tmp5_; - gint _tmp5__length1; - LibraryPhoto* _tmp6_; - GFile* _tmp7_; + if (photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo))) { +#line 2969 "PhotoMonitor.c" + GFile** _tmp3_; + gint _tmp3__length1; + LibraryPhoto* _tmp4_; + GFile* _tmp5_; #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = files; + _tmp3_ = files; #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5__length1 = files_length1; + _tmp3__length1 = files_length1; #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = photo; + _tmp4_ = photo; #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); + _tmp5_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo)); #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_array_add131 (&files, &files_length1, &_files_size_, _tmp7_); -#line 2739 "PhotoMonitor.c" + _vala_array_add132 (&files, &files_length1, &_files_size_, _tmp5_); +#line 2984 "PhotoMonitor.c" } #line 370 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = photo; + _tmp6_ = photo; #line 370 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo)); + _tmp7_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); #line 370 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - raw_files = _tmp9_; + raw_files = _tmp7_; #line 371 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = raw_files; + _tmp8_ = raw_files; #line 371 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp10_ != NULL) { -#line 2751 "PhotoMonitor.c" + if (_tmp8_ != NULL) { +#line 2996 "PhotoMonitor.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp11_; - GeeIterator* _tmp12_; + GeeCollection* _tmp9_; + GeeIterator* _tmp10_; #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = raw_files; + _tmp9_ = raw_files; #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _f_it = _tmp12_; + _f_it = _tmp10_; #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 2764 "PhotoMonitor.c" - GeeIterator* _tmp13_; - gboolean _tmp14_; +#line 3009 "PhotoMonitor.c" + GeeIterator* _tmp11_; GFile* f = NULL; - GeeIterator* _tmp15_; - gpointer _tmp16_; - GFile** _tmp17_; - gint _tmp17__length1; - GFile* _tmp18_; - GFile* _tmp19_; -#line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = _f_it; + GeeIterator* _tmp12_; + gpointer _tmp13_; + GFile** _tmp14_; + gint _tmp14__length1; + GFile* _tmp15_; + GFile* _tmp16_; #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = gee_iterator_next (_tmp13_); + _tmp11_ = _f_it; #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp14_) { + if (!gee_iterator_next (_tmp11_)) { #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 2782 "PhotoMonitor.c" +#line 3024 "PhotoMonitor.c" } #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _f_it; + _tmp12_ = _f_it; #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = gee_iterator_get (_tmp15_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - f = (GFile*) _tmp16_; + f = (GFile*) _tmp13_; #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = files; + _tmp14_ = files; #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17__length1 = files_length1; + _tmp14__length1 = files_length1; #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = f; + _tmp15_ = f; #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = _g_object_ref0 (_tmp18_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_array_add132 (&files, &files_length1, &_files_size_, _tmp19_); + _vala_array_add133 (&files, &files_length1, &_files_size_, _tmp16_); #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (f); -#line 2802 "PhotoMonitor.c" +#line 3044 "PhotoMonitor.c" } #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_f_it); -#line 2806 "PhotoMonitor.c" +#line 3048 "PhotoMonitor.c" } } #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = files; + _tmp18_ = files; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21__length1 = files_length1; + _tmp18__length1 = files_length1; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp21__length1 > 0) { -#line 2815 "PhotoMonitor.c" - GFile** _tmp22_; - gint _tmp22__length1; + if (_tmp18__length1 > 0) { +#line 3057 "PhotoMonitor.c" + GFile** _tmp19_; + gint _tmp19__length1; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = files; + _tmp19_ = files; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22__length1 = files_length1; + _tmp19__length1 = files_length1; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = _tmp22_; + _tmp17_ = _tmp19_; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20__length1 = _tmp22__length1; + _tmp17__length1 = _tmp19__length1; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - __tmp20__size_ = _tmp20__length1; -#line 2828 "PhotoMonitor.c" + __tmp17__size_ = _tmp17__length1; +#line 3070 "PhotoMonitor.c" } else { #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = NULL; + _tmp17_ = NULL; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20__length1 = 0; + _tmp17__length1 = 0; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - __tmp20__size_ = _tmp20__length1; -#line 2836 "PhotoMonitor.c" + __tmp17__size_ = _tmp17__length1; +#line 3078 "PhotoMonitor.c" } #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = (_tmp20_ != NULL) ? _vala_array_dup31 (_tmp20_, _tmp20__length1) : ((gpointer) _tmp20_); + _tmp20_ = (_tmp17_ != NULL) ? _vala_array_dup26 (_tmp17_, _tmp17__length1) : ((gpointer) _tmp17_); #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23__length1 = _tmp20__length1; + _tmp20__length1 = _tmp17__length1; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = _tmp23_; + _tmp21_ = _tmp20_; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24__length1 = _tmp23__length1; + _tmp21__length1 = _tmp20__length1; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (result_length1) { #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *result_length1 = _tmp24__length1; -#line 2850 "PhotoMonitor.c" + *result_length1 = _tmp21__length1; +#line 3092 "PhotoMonitor.c" } #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = _tmp24_; + result = _tmp21_; #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (raw_files); #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2860,21 +3102,23 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba _g_object_unref0 (photo); #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 2862 "PhotoMonitor.c" +#line 3104 "PhotoMonitor.c" } -static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Monitorable* monitorable, GFile* file, GFileInfo* info) { +static void +photo_monitor_real_update_backing_file_info (MediaMonitor* base, + Monitorable* monitorable, + GFile* file, + GFileInfo* info) +{ PhotoMonitor * self; LibraryPhoto* photo = NULL; - Monitorable* _tmp0_; + LibraryPhoto* _tmp0_; LibraryPhoto* _tmp1_; - LibraryPhoto* _tmp2_; + GFile* _tmp2_; GFile* _tmp3_; - GFile* _tmp4_; - GFile* _tmp5_; - gboolean _tmp6_; - gboolean _tmp7_; + gboolean _tmp4_; #line 379 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 379 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -2884,196 +3128,168 @@ static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Mon #line 379 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 380 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = monitorable; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (monitorable, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 380 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 380 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp1_; + photo = _tmp0_; #line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo; -#line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = media_monitor_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MONITORABLE, Monitorable)); -#line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp3_; + _tmp1_ = photo; #line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = file; + _tmp2_ = media_monitor_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MONITORABLE, Monitorable)); #line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = g_file_equal (_tmp4_, _tmp5_); + _tmp3_ = _tmp2_; #line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp4_ = g_file_equal (_tmp3_, file); #line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 382 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp7_) { -#line 2907 "PhotoMonitor.c" - LibraryPhoto* _tmp8_; - GFileInfo* _tmp9_; -#line 383 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = photo; + if (_tmp4_) { +#line 3145 "PhotoMonitor.c" + LibraryPhoto* _tmp5_; #line 383 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = info; + _tmp5_ = photo; #line 383 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_check_for_master_changes (self, _tmp8_, _tmp9_); -#line 2916 "PhotoMonitor.c" + photo_monitor_check_for_master_changes (self, _tmp5_, info); +#line 3151 "PhotoMonitor.c" } else { - gboolean _tmp10_ = FALSE; - LibraryPhoto* _tmp11_; - GFile* _tmp12_; - GFile* _tmp13_; - gboolean _tmp14_; -#line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo; -#line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = photo_monitor_get_editable_file (self, _tmp11_); + gboolean _tmp6_ = FALSE; + LibraryPhoto* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + gboolean _tmp10_; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = _tmp12_; + _tmp7_ = photo; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_ != NULL; + _tmp8_ = photo_monitor_get_editable_file (self, _tmp7_); #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp13_); + _tmp9_ = _tmp8_; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp14_) { -#line 2935 "PhotoMonitor.c" - LibraryPhoto* _tmp15_; - GFile* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; - gboolean _tmp19_; + _tmp10_ = _tmp9_ != NULL; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = photo; + _g_object_unref0 (_tmp9_); #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = photo_monitor_get_editable_file (self, _tmp15_); + if (_tmp10_) { +#line 3170 "PhotoMonitor.c" + LibraryPhoto* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_; + _tmp11_ = photo; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = file; + _tmp12_ = photo_monitor_get_editable_file (self, _tmp11_); #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = g_file_equal (_tmp17_, _tmp18_); + _tmp13_ = _tmp12_; #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _tmp19_; + _tmp6_ = g_file_equal (_tmp13_, file); #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp17_); -#line 2955 "PhotoMonitor.c" + _g_object_unref0 (_tmp13_); +#line 3184 "PhotoMonitor.c" } else { #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = FALSE; -#line 2959 "PhotoMonitor.c" + _tmp6_ = FALSE; +#line 3188 "PhotoMonitor.c" } #line 384 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp10_) { -#line 2963 "PhotoMonitor.c" - LibraryPhoto* _tmp20_; - GFileInfo* _tmp21_; -#line 385 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = photo; + if (_tmp6_) { +#line 3192 "PhotoMonitor.c" + LibraryPhoto* _tmp14_; #line 385 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = info; + _tmp14_ = photo; #line 385 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_check_for_editable_changes (self, _tmp20_, _tmp21_); -#line 2972 "PhotoMonitor.c" + photo_monitor_check_for_editable_changes (self, _tmp14_, info); +#line 3198 "PhotoMonitor.c" } else { - LibraryPhoto* _tmp22_; - GeeCollection* _tmp23_; - GeeCollection* _tmp24_; - gboolean _tmp25_; + LibraryPhoto* _tmp15_; + GeeCollection* _tmp16_; + GeeCollection* _tmp17_; + gboolean _tmp18_; #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = photo; + _tmp15_ = photo; #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = photo_monitor_get_raw_development_files (self, _tmp22_); + _tmp16_ = photo_monitor_get_raw_development_files (self, _tmp15_); #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = _tmp23_; + _tmp17_ = _tmp16_; #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = _tmp24_ != NULL; + _tmp18_ = _tmp17_ != NULL; #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp17_); #line 386 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp25_) { -#line 2990 "PhotoMonitor.c" + if (_tmp18_) { +#line 3216 "PhotoMonitor.c" { GeeIterator* _f_it = NULL; - LibraryPhoto* _tmp26_; - GeeCollection* _tmp27_; - GeeCollection* _tmp28_; - GeeIterator* _tmp29_; - GeeIterator* _tmp30_; + LibraryPhoto* _tmp19_; + GeeCollection* _tmp20_; + GeeCollection* _tmp21_; + GeeIterator* _tmp22_; + GeeIterator* _tmp23_; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = photo; + _tmp19_ = photo; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = photo_monitor_get_raw_development_files (self, _tmp26_); + _tmp20_ = photo_monitor_get_raw_development_files (self, _tmp19_); #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = _tmp27_; + _tmp21_ = _tmp20_; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp22_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ITERABLE, GeeIterable)); #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = _tmp29_; + _tmp23_ = _tmp22_; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp28_); + _g_object_unref0 (_tmp21_); #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _f_it = _tmp30_; + _f_it = _tmp23_; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 3014 "PhotoMonitor.c" - GeeIterator* _tmp31_; - gboolean _tmp32_; +#line 3240 "PhotoMonitor.c" + GeeIterator* _tmp24_; GFile* f = NULL; - GeeIterator* _tmp33_; - gpointer _tmp34_; - GFile* _tmp35_; - GFile* _tmp36_; - gboolean _tmp37_; + GeeIterator* _tmp25_; + gpointer _tmp26_; + GFile* _tmp27_; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = _f_it; + _tmp24_ = _f_it; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = gee_iterator_next (_tmp31_); -#line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp32_) { + if (!gee_iterator_next (_tmp24_)) { #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3031 "PhotoMonitor.c" +#line 3252 "PhotoMonitor.c" } #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = _f_it; + _tmp25_ = _f_it; #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp34_ = gee_iterator_get (_tmp33_); + _tmp26_ = gee_iterator_get (_tmp25_); #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - f = (GFile*) _tmp34_; -#line 388 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = f; -#line 388 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp36_ = file; + f = (GFile*) _tmp26_; #line 388 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp37_ = g_file_equal (_tmp35_, _tmp36_); + _tmp27_ = f; #line 388 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp37_) { -#line 3047 "PhotoMonitor.c" - LibraryPhoto* _tmp38_; - GFileInfo* _tmp39_; -#line 389 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp38_ = photo; + if (g_file_equal (_tmp27_, file)) { +#line 3264 "PhotoMonitor.c" + LibraryPhoto* _tmp28_; #line 389 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp39_ = info; + _tmp28_ = photo; #line 389 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_check_for_raw_development_changes (self, _tmp38_, _tmp39_); -#line 3056 "PhotoMonitor.c" + photo_monitor_check_for_raw_development_changes (self, _tmp28_, info); +#line 3270 "PhotoMonitor.c" } #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (f); -#line 3060 "PhotoMonitor.c" +#line 3274 "PhotoMonitor.c" } #line 387 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_f_it); -#line 3064 "PhotoMonitor.c" +#line 3278 "PhotoMonitor.c" } } } } #line 379 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); -#line 3071 "PhotoMonitor.c" +#line 3285 "PhotoMonitor.c" } -static void photo_monitor_real_notify_discovery_completing (MediaMonitor* base) { +static void +photo_monitor_real_notify_discovery_completing (MediaMonitor* base) +{ PhotoMonitor * self; GeeArrayList* _tmp0_; #line 394 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3082,21 +3298,19 @@ static void photo_monitor_real_notify_discovery_completing (MediaMonitor* base) _tmp0_ = self->priv->matched_editables; #line 395 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 3084 "PhotoMonitor.c" +#line 3300 "PhotoMonitor.c" } -static void photo_monitor_check_for_master_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info) { - GFileInfo* _tmp0_; +static void +photo_monitor_check_for_master_changes (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info) +{ BackingPhotoRow* state = NULL; - LibraryPhoto* _tmp1_; + BackingPhotoRow* _tmp0_; + BackingPhotoRow* _tmp1_; BackingPhotoRow* _tmp2_; - BackingPhotoRow* _tmp3_; - GFileInfo* _tmp4_; - gboolean _tmp5_; - BackingPhotoRow* _tmp6_; - GFileInfo* _tmp7_; - gboolean _tmp8_; #line 402 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 402 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3104,80 +3318,55 @@ static void photo_monitor_check_for_master_changes (PhotoMonitor* self, LibraryP #line 402 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 404 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = info; -#line 404 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp0_ == NULL) { + if (info == NULL) { #line 405 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3111 "PhotoMonitor.c" +#line 3323 "PhotoMonitor.c" } #line 407 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo; -#line 407 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo)); + _tmp0_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 407 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp2_; + state = _tmp0_; #line 408 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = state; -#line 408 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = info; + _tmp1_ = state; #line 408 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = backing_photo_row_matches_file_info (_tmp3_, _tmp4_); -#line 408 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp5_) { + if (backing_photo_row_matches_file_info (_tmp1_, info)) { #line 409 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (state); #line 409 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3131 "PhotoMonitor.c" +#line 3337 "PhotoMonitor.c" } #line 411 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = state; + _tmp2_ = state; #line 411 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = info; -#line 411 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = backing_photo_row_is_touched (_tmp6_, _tmp7_); -#line 411 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp8_) { -#line 3141 "PhotoMonitor.c" - LibraryPhoto* _tmp9_; - LibraryPhoto* _tmp10_; - GFileInfo* _tmp11_; -#line 412 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = photo; + if (backing_photo_row_is_touched (_tmp2_, info)) { #line 412 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_info_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MONITORABLE, Monitorable)); -#line 413 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; -#line 413 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = info; + media_monitor_update_master_file_info_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MONITORABLE, Monitorable)); #line 413 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_alterations_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MONITORABLE, Monitorable), _tmp11_); -#line 3155 "PhotoMonitor.c" + media_monitor_update_master_file_alterations_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MONITORABLE, Monitorable), info); +#line 3347 "PhotoMonitor.c" } else { - LibraryPhoto* _tmp12_; -#line 415 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = photo; #line 415 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_master (self, _tmp12_); -#line 3162 "PhotoMonitor.c" + photo_monitor_update_reimport_master (self, photo); +#line 3351 "PhotoMonitor.c" } #line 402 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (state); -#line 3166 "PhotoMonitor.c" +#line 3355 "PhotoMonitor.c" } -static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info) { - GFileInfo* _tmp0_; +static void +photo_monitor_check_for_editable_changes (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info) +{ BackingPhotoRow* state = NULL; - LibraryPhoto* _tmp2_; - BackingPhotoRow* _tmp3_; - gboolean _tmp4_ = FALSE; - BackingPhotoRow* _tmp5_; - BackingPhotoRow* _tmp9_; - GFileInfo* _tmp10_; - gboolean _tmp11_; + BackingPhotoRow* _tmp0_; + gboolean _tmp1_ = FALSE; + BackingPhotoRow* _tmp2_; + BackingPhotoRow* _tmp4_; #line 419 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 419 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3185,97 +3374,68 @@ static void photo_monitor_check_for_editable_changes (PhotoMonitor* self, Librar #line 419 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 420 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = info; -#line 420 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp0_ == NULL) { -#line 3190 "PhotoMonitor.c" - LibraryPhoto* _tmp1_; -#line 421 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo; + if (info == NULL) { #line 421 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_revert_to_master (self, _tmp1_); + photo_monitor_update_revert_to_master (self, photo); #line 423 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3198 "PhotoMonitor.c" +#line 3381 "PhotoMonitor.c" } #line 427 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo; + _tmp0_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 427 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo)); -#line 427 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp3_; + state = _tmp0_; #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = state; + _tmp2_ = state; #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp5_ == NULL) { + if (_tmp2_ == NULL) { #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = TRUE; -#line 3212 "PhotoMonitor.c" + _tmp1_ = TRUE; +#line 3393 "PhotoMonitor.c" } else { - BackingPhotoRow* _tmp6_; - GFileInfo* _tmp7_; - gboolean _tmp8_; -#line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = state; -#line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = info; + BackingPhotoRow* _tmp3_; #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = backing_photo_row_matches_file_info (_tmp6_, _tmp7_); + _tmp3_ = state; #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp8_; -#line 3225 "PhotoMonitor.c" + _tmp1_ = backing_photo_row_matches_file_info (_tmp3_, info); +#line 3400 "PhotoMonitor.c" } #line 428 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp4_) { + if (_tmp1_) { #line 429 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (state); #line 429 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3233 "PhotoMonitor.c" +#line 3408 "PhotoMonitor.c" } #line 431 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = state; -#line 431 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = info; -#line 431 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = backing_photo_row_is_touched (_tmp9_, _tmp10_); + _tmp4_ = state; #line 431 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp11_) { -#line 3243 "PhotoMonitor.c" - LibraryPhoto* _tmp12_; - LibraryPhoto* _tmp13_; - GFileInfo* _tmp14_; -#line 432 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = photo; + if (backing_photo_row_is_touched (_tmp4_, info)) { #line 432 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_info_altered (self, _tmp12_); -#line 433 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = photo; -#line 433 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = info; + photo_monitor_update_editable_file_info_altered (self, photo); #line 433 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_alterations_completed (self, _tmp13_, _tmp14_); -#line 3257 "PhotoMonitor.c" + photo_monitor_update_editable_file_alterations_completed (self, photo, info); +#line 3418 "PhotoMonitor.c" } else { - LibraryPhoto* _tmp15_; #line 435 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = photo; -#line 435 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_editable (self, _tmp15_); -#line 3264 "PhotoMonitor.c" + photo_monitor_update_reimport_editable (self, photo); +#line 3422 "PhotoMonitor.c" } #line 419 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (state); -#line 3268 "PhotoMonitor.c" +#line 3426 "PhotoMonitor.c" } -static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info) { - GFileInfo* _tmp0_; +static void +photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info) +{ GeeCollection* rows = NULL; - LibraryPhoto* _tmp2_; - GeeCollection* _tmp3_; - GeeCollection* _tmp4_; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; #line 439 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 439 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3283,84 +3443,66 @@ static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, #line 439 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 440 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = info; -#line 440 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp0_ == NULL) { -#line 3288 "PhotoMonitor.c" - LibraryPhoto* _tmp1_; + if (info == NULL) { #line 442 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo; -#line 442 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_set_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL); + photo_set_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL, TRUE); #line 444 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3296 "PhotoMonitor.c" +#line 3450 "PhotoMonitor.c" } #line 447 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo; -#line 447 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo)); + _tmp0_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 447 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - rows = _tmp3_; + rows = _tmp0_; #line 448 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = rows; + _tmp1_ = rows; #line 448 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp4_ == NULL) { + if (_tmp1_ == NULL) { #line 449 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (rows); #line 449 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3312 "PhotoMonitor.c" +#line 3464 "PhotoMonitor.c" } { GeeIterator* _row_it = NULL; - GeeCollection* _tmp5_; - GeeIterator* _tmp6_; + GeeCollection* _tmp2_; + GeeIterator* _tmp3_; #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = rows; + _tmp2_ = rows; #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _row_it = _tmp6_; + _row_it = _tmp3_; #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 3326 "PhotoMonitor.c" - GeeIterator* _tmp7_; - gboolean _tmp8_; +#line 3478 "PhotoMonitor.c" + GeeIterator* _tmp4_; BackingPhotoRow* row = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - BackingPhotoRow* _tmp11_; - GFileInfo* _tmp12_; - gboolean _tmp13_; - GFileInfo* _tmp14_; - const gchar* _tmp15_; - BackingPhotoRow* _tmp16_; - const gchar* _tmp17_; -#line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _row_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + BackingPhotoRow* _tmp7_; + const gchar* _tmp8_; + BackingPhotoRow* _tmp9_; + const gchar* _tmp10_; #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = gee_iterator_next (_tmp7_); + _tmp4_ = _row_it; #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp4_)) { #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3347 "PhotoMonitor.c" +#line 3493 "PhotoMonitor.c" } #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = _row_it; + _tmp5_ = _row_it; #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - row = (BackingPhotoRow*) _tmp10_; -#line 454 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = row; + row = (BackingPhotoRow*) _tmp6_; #line 454 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = info; + _tmp7_ = row; #line 454 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = backing_photo_row_matches_file_info (_tmp11_, _tmp12_); -#line 454 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp13_) { + if (backing_photo_row_matches_file_info (_tmp7_, info)) { #line 455 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (row); #line 455 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3369,80 +3511,65 @@ static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self, _g_object_unref0 (rows); #line 455 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 3371 "PhotoMonitor.c" +#line 3513 "PhotoMonitor.c" } #line 456 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = info; -#line 456 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = g_file_info_get_name (_tmp14_); + _tmp8_ = g_file_info_get_name (info); #line 456 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = row; + _tmp9_ = row; #line 456 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_->filepath; + _tmp10_ = _tmp9_->filepath; #line 456 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (g_strcmp0 (_tmp15_, _tmp17_) == 0) { -#line 3383 "PhotoMonitor.c" - BackingPhotoRow* _tmp18_; - GFileInfo* _tmp19_; - gboolean _tmp20_; + if (g_strcmp0 (_tmp8_, _tmp10_) == 0) { +#line 3523 "PhotoMonitor.c" + BackingPhotoRow* _tmp11_; #line 457 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = row; + _tmp11_ = row; #line 457 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = info; -#line 457 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = backing_photo_row_is_touched (_tmp18_, _tmp19_); -#line 457 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp20_) { -#line 3395 "PhotoMonitor.c" - LibraryPhoto* _tmp21_; - LibraryPhoto* _tmp22_; + if (backing_photo_row_is_touched (_tmp11_, info)) { #line 458 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = photo; -#line 458 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_info_altered (self, _tmp21_); -#line 459 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = photo; + photo_monitor_update_raw_development_file_info_altered (self, photo); #line 459 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_alterations_completed (self, _tmp22_); -#line 3406 "PhotoMonitor.c" + photo_monitor_update_raw_development_file_alterations_completed (self, photo); +#line 3533 "PhotoMonitor.c" } else { - LibraryPhoto* _tmp23_; #line 461 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = photo; -#line 461 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_raw_developments (self, _tmp23_); -#line 3413 "PhotoMonitor.c" + photo_monitor_update_reimport_raw_developments (self, photo); +#line 3537 "PhotoMonitor.c" } #line 464 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (row); #line 464 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3419 "PhotoMonitor.c" +#line 3543 "PhotoMonitor.c" } #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _backing_photo_row_unref0 (row); -#line 3423 "PhotoMonitor.c" +#line 3547 "PhotoMonitor.c" } #line 453 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_row_it); -#line 3427 "PhotoMonitor.c" +#line 3551 "PhotoMonitor.c" } #line 439 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (rows); -#line 3431 "PhotoMonitor.c" +#line 3555 "PhotoMonitor.c" } -static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFile* file, GFileInfo* info) { +static gboolean +photo_monitor_real_notify_file_created (MediaMonitor* base, + GFile* file, + GFileInfo* info) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState state = 0; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_; + LibraryPhotoSourceCollectionState _tmp3_; #line 469 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 469 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3450,29 +3577,27 @@ static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFil #line 469 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); #line 471 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 471 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + state = _tmp0_; #line 471 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; -#line 471 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp2_; + photo = _tmp1_; #line 472 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; + _tmp2_ = photo; #line 472 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 473 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = FALSE; #line 473 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); #line 473 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 3469 "PhotoMonitor.c" +#line 3594 "PhotoMonitor.c" } #line 475 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = state; + _tmp3_ = state; #line 475 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 475 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 475 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3481,76 +3606,73 @@ static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFil case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: #line 475 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 3483 "PhotoMonitor.c" +#line 3608 "PhotoMonitor.c" { - GFile* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - LibraryPhotoSourceCollectionState _tmp8_; - GEnumValue* _tmp9_; + gchar* _tmp4_; + gchar* _tmp5_; + LibraryPhotoSourceCollectionState _tmp6_; + GEnumValue* _tmp7_; #line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = file; + _tmp4_ = g_file_get_path (file); #line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp5_ = _tmp4_; #line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = state; #line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = state; + _tmp7_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp6_); #line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp8_); + g_warning ("PhotoMonitor.vala:481: File %s created in %s state", _tmp5_, (_tmp7_ != NULL) ? _tmp7_->value_name : NULL); #line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_warning ("PhotoMonitor.vala:481: File %s created in %s state", _tmp7_, (_tmp9_ != NULL) ? _tmp9_->value_name : NULL); -#line 481 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp5_); #line 482 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3506 "PhotoMonitor.c" +#line 3628 "PhotoMonitor.c" } #line 475 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 3510 "PhotoMonitor.c" +#line 3632 "PhotoMonitor.c" { - LibraryPhoto* _tmp10_; + LibraryPhoto* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - LibraryPhoto* _tmp15_; + LibraryPhoto* _tmp13_; #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; + _tmp8_ = photo; #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = g_strdup_printf ("Will mark %s online", _tmp12_); + _tmp11_ = g_strdup_printf ("Will mark %s online", _tmp10_); #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_; -#line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp14_); + _tmp12_ = _tmp11_; #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp14_); + media_monitor_mdbg (_tmp12_); #line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_free0 (_tmp12_); +#line 485 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" + _g_free0 (_tmp10_); #line 486 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = photo; + _tmp13_ = photo; #line 486 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MONITORABLE, Monitorable)); #line 487 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3540 "PhotoMonitor.c" +#line 3662 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp16_; - GEnumValue* _tmp17_; + LibraryPhotoSourceCollectionState _tmp14_; + GEnumValue* _tmp15_; #line 490 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = state; + _tmp14_ = state; #line 490 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp16_); + _tmp15_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp14_); #line 490 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:490: Unknown LibraryPhoto collection state %s", (_tmp17_ != NULL) ? _tmp17_->value_name : NULL); -#line 3552 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:490: Unknown LibraryPhoto collection state %s", (_tmp15_ != NULL) ? _tmp15_->value_name : NULL); +#line 3674 "PhotoMonitor.c" } } #line 493 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3559,25 +3681,28 @@ static gboolean photo_monitor_real_notify_file_created (MediaMonitor* base, GFil _g_object_unref0 (photo); #line 493 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 3561 "PhotoMonitor.c" +#line 3683 "PhotoMonitor.c" } -static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile* old_file, GFile* new_file, GFileInfo* info) { +static gboolean +photo_monitor_real_notify_file_moved (MediaMonitor* base, + GFile* old_file, + GFile* new_file, + GFileInfo* info) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState old_state = 0; LibraryPhoto* old_photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; - LibraryPhoto* _tmp2_; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhotoSourceCollectionState new_state = 0; LibraryPhoto* new_photo = NULL; - GFile* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_ = 0; + LibraryPhotoSourceCollectionState _tmp2_ = 0; + LibraryPhoto* _tmp3_; + gboolean _tmp4_ = FALSE; LibraryPhoto* _tmp5_; - gboolean _tmp6_ = FALSE; - LibraryPhoto* _tmp7_; #line 496 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 496 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3587,373 +3712,351 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile* #line 496 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); #line 498 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = old_file; -#line 498 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + _tmp1_ = photo_monitor_get_photo_state_by_file (self, old_file, &_tmp0_); #line 498 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - old_state = _tmp1_; + old_state = _tmp0_; #line 498 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - old_photo = _tmp2_; -#line 501 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = new_file; + old_photo = _tmp1_; #line 501 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo_monitor_get_photo_state_by_file (self, _tmp3_, &_tmp4_); + _tmp3_ = photo_monitor_get_photo_state_by_file (self, new_file, &_tmp2_); #line 501 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - new_state = _tmp4_; + new_state = _tmp2_; #line 501 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - new_photo = _tmp5_; + new_photo = _tmp3_; #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = old_photo; + _tmp5_ = old_photo; #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp7_ != NULL) { -#line 3608 "PhotoMonitor.c" - LibraryPhoto* _tmp8_; + if (_tmp5_ != NULL) { +#line 3729 "PhotoMonitor.c" + LibraryPhoto* _tmp6_; #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = new_photo; + _tmp6_ = new_photo; #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _tmp8_ == NULL; -#line 3614 "PhotoMonitor.c" + _tmp4_ = _tmp6_ == NULL; +#line 3735 "PhotoMonitor.c" } else { #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = FALSE; -#line 3618 "PhotoMonitor.c" + _tmp4_ = FALSE; +#line 3739 "PhotoMonitor.c" } #line 515 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp6_) { -#line 3622 "PhotoMonitor.c" - LibraryPhotoSourceCollectionState _tmp9_; + if (_tmp4_) { +#line 3743 "PhotoMonitor.c" + LibraryPhotoSourceCollectionState _tmp7_; #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = old_state; + _tmp7_ = old_state; #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp9_) { + switch (_tmp7_) { #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 3634 "PhotoMonitor.c" +#line 3755 "PhotoMonitor.c" { - LibraryPhoto* _tmp10_; + LibraryPhoto* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; - GFile* _tmp13_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - LibraryPhoto* _tmp18_; - GFile* _tmp19_; + LibraryPhoto* _tmp15_; #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = old_photo; + _tmp8_ = old_photo; #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = _tmp11_; -#line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = new_file; + _tmp10_ = _tmp9_; #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = g_file_get_path (_tmp13_); -#line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _tmp14_; + _tmp11_ = g_file_get_path (new_file); #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = g_strdup_printf ("Will set new master file for %s to %s", _tmp12_, _tmp15_); + _tmp12_ = _tmp11_; #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_; + _tmp13_ = g_strdup_printf ("Will set new master file for %s to %s", _tmp10_, _tmp12_); #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp17_); + _tmp14_ = _tmp13_; #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp17_); + media_monitor_mdbg (_tmp14_); #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_free0 (_tmp12_); +#line 521 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" + _g_free0 (_tmp10_); #line 523 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = old_photo; -#line 523 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = new_file; + _tmp15_ = old_photo; #line 523 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MONITORABLE, Monitorable), _tmp19_); + media_monitor_update_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MONITORABLE, Monitorable), new_file); #line 524 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3678 "PhotoMonitor.c" +#line 3793 "PhotoMonitor.c" } #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 3682 "PhotoMonitor.c" +#line 3797 "PhotoMonitor.c" { - LibraryPhoto* _tmp20_; + LibraryPhoto* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; - GFile* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - LibraryPhoto* _tmp28_; - GFile* _tmp29_; + LibraryPhoto* _tmp23_; #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = old_photo; + _tmp16_ = old_photo; #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)); + _tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = _tmp21_; -#line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = new_file; + _tmp18_ = _tmp17_; #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = g_file_get_path (_tmp23_); + _tmp19_ = g_file_get_path (new_file); #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = _tmp24_; + _tmp20_ = _tmp19_; #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = g_strdup_printf ("Will set new editable file for %s to %s", _tmp22_, _tmp25_); + _tmp21_ = g_strdup_printf ("Will set new editable file for %s to %s", _tmp18_, _tmp20_); #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = _tmp26_; + _tmp22_ = _tmp21_; #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp27_); + media_monitor_mdbg (_tmp22_); #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp22_); #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp20_); #line 527 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp18_); #line 529 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = old_photo; + _tmp23_ = old_photo; #line 529 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = new_file; -#line 529 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file (self, _tmp28_, _tmp29_); + photo_monitor_update_editable_file (self, _tmp23_, new_file); #line 530 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3726 "PhotoMonitor.c" +#line 3835 "PhotoMonitor.c" } #line 517 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 3730 "PhotoMonitor.c" +#line 3839 "PhotoMonitor.c" { - LibraryPhoto* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - GFile* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; - LibraryPhoto* _tmp38_; - GFile* _tmp39_; -#line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = old_photo; + LibraryPhoto* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; + LibraryPhoto* _tmp31_; #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_OBJECT, DataObject)); + _tmp24_ = old_photo; #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = _tmp31_; + _tmp25_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject)); #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = new_file; + _tmp26_ = _tmp25_; #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp34_ = g_file_get_path (_tmp33_); + _tmp27_ = g_file_get_path (new_file); #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = _tmp34_; + _tmp28_ = _tmp27_; #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp36_ = g_strdup_printf ("Will set new raw development file for %s to %s", _tmp32_, _tmp35_); + _tmp29_ = g_strdup_printf ("Will set new raw development file for %s to %s", _tmp26_, _tmp28_); #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp37_ = _tmp36_; + _tmp30_ = _tmp29_; #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp37_); + media_monitor_mdbg (_tmp30_); #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp30_); #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp28_); #line 533 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp26_); #line 535 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp38_ = old_photo; + _tmp31_ = old_photo; #line 535 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp39_ = new_file; -#line 535 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file (self, _tmp38_, _tmp39_); + photo_monitor_update_raw_development_file (self, _tmp31_, new_file); #line 536 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3774 "PhotoMonitor.c" +#line 3877 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp40_; - GEnumValue* _tmp41_; + LibraryPhotoSourceCollectionState _tmp32_; + GEnumValue* _tmp33_; #line 539 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp40_ = old_state; + _tmp32_ = old_state; #line 539 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp41_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp40_); + _tmp33_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp32_); #line 539 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:539: Unknown LibraryPhoto collection state %s", (_tmp41_ != NULL) ? _tmp41_->value_name : NULL); -#line 3786 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:539: Unknown LibraryPhoto collection state %s", (_tmp33_ != NULL) ? _tmp33_->value_name : NULL); +#line 3889 "PhotoMonitor.c" } } } else { - gboolean _tmp42_ = FALSE; - LibraryPhoto* _tmp43_; + gboolean _tmp34_ = FALSE; + LibraryPhoto* _tmp35_; #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp43_ = old_photo; + _tmp35_ = old_photo; #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp43_ == NULL) { -#line 3796 "PhotoMonitor.c" - LibraryPhoto* _tmp44_; + if (_tmp35_ == NULL) { +#line 3899 "PhotoMonitor.c" + LibraryPhoto* _tmp36_; #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp44_ = new_photo; + _tmp36_ = new_photo; #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp42_ = _tmp44_ != NULL; -#line 3802 "PhotoMonitor.c" + _tmp34_ = _tmp36_ != NULL; +#line 3905 "PhotoMonitor.c" } else { #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp42_ = FALSE; -#line 3806 "PhotoMonitor.c" + _tmp34_ = FALSE; +#line 3909 "PhotoMonitor.c" } #line 541 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp42_) { -#line 3810 "PhotoMonitor.c" - LibraryPhotoSourceCollectionState _tmp45_; + if (_tmp34_) { +#line 3913 "PhotoMonitor.c" + LibraryPhotoSourceCollectionState _tmp37_; #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp45_ = new_state; + _tmp37_ = new_state; #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp45_) { + switch (_tmp37_) { #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 3822 "PhotoMonitor.c" +#line 3925 "PhotoMonitor.c" { - LibraryPhoto* _tmp46_; - gchar* _tmp47_; - gchar* _tmp48_; - gchar* _tmp49_; - gchar* _tmp50_; - LibraryPhoto* _tmp51_; + LibraryPhoto* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; + LibraryPhoto* _tmp43_; #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp46_ = new_photo; + _tmp38_ = new_photo; #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp47_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_DATA_OBJECT, DataObject)); + _tmp39_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject)); #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp48_ = _tmp47_; + _tmp40_ = _tmp39_; #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp49_ = g_strdup_printf ("Will reimport master file for %s", _tmp48_); + _tmp41_ = g_strdup_printf ("Will reimport master file for %s", _tmp40_); #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp50_ = _tmp49_; + _tmp42_ = _tmp41_; #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp50_); + media_monitor_mdbg (_tmp42_); #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp50_); + _g_free0 (_tmp42_); #line 547 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp48_); + _g_free0 (_tmp40_); #line 548 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp51_ = new_photo; + _tmp43_ = new_photo; #line 548 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_master (self, _tmp51_); + photo_monitor_update_reimport_master (self, _tmp43_); #line 549 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3852 "PhotoMonitor.c" +#line 3955 "PhotoMonitor.c" } #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 3856 "PhotoMonitor.c" +#line 3959 "PhotoMonitor.c" { - LibraryPhoto* _tmp52_; - gchar* _tmp53_; - gchar* _tmp54_; - gchar* _tmp55_; - gchar* _tmp56_; - LibraryPhoto* _tmp57_; + LibraryPhoto* _tmp44_; + gchar* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; + LibraryPhoto* _tmp49_; #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp52_ = new_photo; + _tmp44_ = new_photo; #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp53_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_DATA_OBJECT, DataObject)); + _tmp45_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATA_OBJECT, DataObject)); #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp54_ = _tmp53_; + _tmp46_ = _tmp45_; #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp55_ = g_strdup_printf ("Will reimport editable file for %s", _tmp54_); + _tmp47_ = g_strdup_printf ("Will reimport editable file for %s", _tmp46_); #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp56_ = _tmp55_; + _tmp48_ = _tmp47_; #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp56_); + media_monitor_mdbg (_tmp48_); #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp56_); + _g_free0 (_tmp48_); #line 552 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp54_); + _g_free0 (_tmp46_); #line 553 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp57_ = new_photo; + _tmp49_ = new_photo; #line 553 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_editable (self, _tmp57_); + photo_monitor_update_reimport_editable (self, _tmp49_); #line 554 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3886 "PhotoMonitor.c" +#line 3989 "PhotoMonitor.c" } #line 543 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 3890 "PhotoMonitor.c" +#line 3993 "PhotoMonitor.c" { - LibraryPhoto* _tmp58_; - gchar* _tmp59_; - gchar* _tmp60_; - gchar* _tmp61_; - gchar* _tmp62_; - LibraryPhoto* _tmp63_; + LibraryPhoto* _tmp50_; + gchar* _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; + LibraryPhoto* _tmp55_; #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp58_ = new_photo; + _tmp50_ = new_photo; #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp59_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_DATA_OBJECT, DataObject)); + _tmp51_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_OBJECT, DataObject)); #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp60_ = _tmp59_; + _tmp52_ = _tmp51_; #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp61_ = g_strdup_printf ("Will reimport raw development file for %s", _tmp60_); + _tmp53_ = g_strdup_printf ("Will reimport raw development file for %s", _tmp52_); #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp62_ = _tmp61_; + _tmp54_ = _tmp53_; #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp62_); + media_monitor_mdbg (_tmp54_); #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp62_); + _g_free0 (_tmp54_); #line 557 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp60_); + _g_free0 (_tmp52_); #line 558 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp63_ = new_photo; + _tmp55_ = new_photo; #line 558 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_raw_developments (self, _tmp63_); + photo_monitor_update_reimport_raw_developments (self, _tmp55_); #line 559 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 3920 "PhotoMonitor.c" +#line 4023 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp64_; - GEnumValue* _tmp65_; + LibraryPhotoSourceCollectionState _tmp56_; + GEnumValue* _tmp57_; #line 562 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp64_ = new_state; + _tmp56_ = new_state; #line 562 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp65_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp64_); + _tmp57_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp56_); #line 562 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:562: Unknown LibraryPhoto collection state %s", (_tmp65_ != NULL) ? _tmp65_->value_name : NULL); -#line 3932 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:562: Unknown LibraryPhoto collection state %s", (_tmp57_ != NULL) ? _tmp57_->value_name : NULL); +#line 4035 "PhotoMonitor.c" } } } else { - gboolean _tmp66_ = FALSE; - LibraryPhoto* _tmp67_; + gboolean _tmp58_ = FALSE; + LibraryPhoto* _tmp59_; #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp67_ = old_photo; + _tmp59_ = old_photo; #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp67_ == NULL) { -#line 3942 "PhotoMonitor.c" - LibraryPhoto* _tmp68_; + if (_tmp59_ == NULL) { +#line 4045 "PhotoMonitor.c" + LibraryPhoto* _tmp60_; #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp68_ = new_photo; + _tmp60_ = new_photo; #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp66_ = _tmp68_ == NULL; -#line 3948 "PhotoMonitor.c" + _tmp58_ = _tmp60_ == NULL; +#line 4051 "PhotoMonitor.c" } else { #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp66_ = FALSE; -#line 3952 "PhotoMonitor.c" + _tmp58_ = FALSE; +#line 4055 "PhotoMonitor.c" } #line 564 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp66_) { + if (_tmp58_) { #line 566 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = FALSE; #line 566 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -3962,254 +4065,254 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile* _g_object_unref0 (old_photo); #line 566 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 3964 "PhotoMonitor.c" +#line 4067 "PhotoMonitor.c" } else { - gboolean _tmp69_ = FALSE; - LibraryPhoto* _tmp70_; - LibraryPhotoSourceCollectionState _tmp72_; - LibraryPhotoSourceCollectionState _tmp87_; + gboolean _tmp61_ = FALSE; + LibraryPhoto* _tmp62_; + LibraryPhotoSourceCollectionState _tmp64_; + LibraryPhotoSourceCollectionState _tmp79_; #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp70_ = old_photo; + _tmp62_ = old_photo; #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp70_ != NULL) { -#line 3974 "PhotoMonitor.c" - LibraryPhoto* _tmp71_; + if (_tmp62_ != NULL) { +#line 4077 "PhotoMonitor.c" + LibraryPhoto* _tmp63_; #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp71_ = new_photo; + _tmp63_ = new_photo; #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp69_ = _tmp71_ != NULL; -#line 3980 "PhotoMonitor.c" + _tmp61_ = _tmp63_ != NULL; +#line 4083 "PhotoMonitor.c" } else { #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp69_ = FALSE; -#line 3984 "PhotoMonitor.c" + _tmp61_ = FALSE; +#line 4087 "PhotoMonitor.c" } #line 568 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (_tmp69_, "old_photo != null && new_photo != null"); + _vala_assert (_tmp61_, "old_photo != null && new_photo != null"); #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp72_ = old_state; + _tmp64_ = old_state; #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp72_) { + switch (_tmp64_) { #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: -#line 3994 "PhotoMonitor.c" +#line 4097 "PhotoMonitor.c" { - LibraryPhoto* _tmp73_; - gchar* _tmp74_; - gchar* _tmp75_; - gchar* _tmp76_; - gchar* _tmp77_; - LibraryPhoto* _tmp78_; + LibraryPhoto* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; + gchar* _tmp68_; + gchar* _tmp69_; + LibraryPhoto* _tmp70_; #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp73_ = old_photo; + _tmp65_ = old_photo; #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp74_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_DATA_OBJECT, DataObject)); + _tmp66_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_DATA_OBJECT, DataObject)); #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp75_ = _tmp74_; + _tmp67_ = _tmp66_; #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp76_ = g_strdup_printf ("Will mark offline %s", _tmp75_); + _tmp68_ = g_strdup_printf ("Will mark offline %s", _tmp67_); #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp77_ = _tmp76_; + _tmp69_ = _tmp68_; #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp77_); + media_monitor_mdbg (_tmp69_); #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp77_); + _g_free0 (_tmp69_); #line 572 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp75_); + _g_free0 (_tmp67_); #line 573 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp78_ = old_photo; + _tmp70_ = old_photo; #line 573 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MONITORABLE, Monitorable)); #line 574 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4024 "PhotoMonitor.c" +#line 4127 "PhotoMonitor.c" } #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 4030 "PhotoMonitor.c" +#line 4133 "PhotoMonitor.c" { #line 579 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4034 "PhotoMonitor.c" +#line 4137 "PhotoMonitor.c" } #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 4038 "PhotoMonitor.c" +#line 4141 "PhotoMonitor.c" { - LibraryPhoto* _tmp79_; - gchar* _tmp80_; - gchar* _tmp81_; - gchar* _tmp82_; - gchar* _tmp83_; - LibraryPhoto* _tmp84_; + LibraryPhoto* _tmp71_; + gchar* _tmp72_; + gchar* _tmp73_; + gchar* _tmp74_; + gchar* _tmp75_; + LibraryPhoto* _tmp76_; #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp79_ = old_photo; + _tmp71_ = old_photo; #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp80_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_DATA_OBJECT, DataObject)); + _tmp72_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, TYPE_DATA_OBJECT, DataObject)); #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp81_ = _tmp80_; + _tmp73_ = _tmp72_; #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp82_ = g_strdup_printf ("Will revert %s to master", _tmp81_); + _tmp74_ = g_strdup_printf ("Will revert %s to master", _tmp73_); #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp83_ = _tmp82_; + _tmp75_ = _tmp74_; #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp83_); + media_monitor_mdbg (_tmp75_); #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp83_); + _g_free0 (_tmp75_); #line 582 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp81_); + _g_free0 (_tmp73_); #line 583 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp84_ = old_photo; + _tmp76_ = old_photo; #line 583 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_revert_to_master (self, _tmp84_); + photo_monitor_update_revert_to_master (self, _tmp76_); #line 584 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4068 "PhotoMonitor.c" +#line 4171 "PhotoMonitor.c" } #line 570 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 4072 "PhotoMonitor.c" +#line 4175 "PhotoMonitor.c" { #line 588 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4076 "PhotoMonitor.c" +#line 4179 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp85_; - GEnumValue* _tmp86_; + LibraryPhotoSourceCollectionState _tmp77_; + GEnumValue* _tmp78_; #line 591 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp85_ = old_state; + _tmp77_ = old_state; #line 591 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp86_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp85_); + _tmp78_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp77_); #line 591 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:591: Unknown LibraryPhoto collection state %s", (_tmp86_ != NULL) ? _tmp86_->value_name : NULL); -#line 4088 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:591: Unknown LibraryPhoto collection state %s", (_tmp78_ != NULL) ? _tmp78_->value_name : NULL); +#line 4191 "PhotoMonitor.c" } } #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp87_ = new_state; + _tmp79_ = new_state; #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp87_) { + switch (_tmp79_) { #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 4101 "PhotoMonitor.c" +#line 4204 "PhotoMonitor.c" { - LibraryPhoto* _tmp88_; - gchar* _tmp89_; - gchar* _tmp90_; - gchar* _tmp91_; - gchar* _tmp92_; - LibraryPhoto* _tmp93_; + LibraryPhoto* _tmp80_; + gchar* _tmp81_; + gchar* _tmp82_; + gchar* _tmp83_; + gchar* _tmp84_; + LibraryPhoto* _tmp85_; #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp88_ = new_photo; + _tmp80_ = new_photo; #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp89_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_DATA_OBJECT, DataObject)); + _tmp81_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_DATA_OBJECT, DataObject)); #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp90_ = _tmp89_; + _tmp82_ = _tmp81_; #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp91_ = g_strdup_printf ("Will reimport master file for %s", _tmp90_); + _tmp83_ = g_strdup_printf ("Will reimport master file for %s", _tmp82_); #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp92_ = _tmp91_; + _tmp84_ = _tmp83_; #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp92_); + media_monitor_mdbg (_tmp84_); #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp92_); + _g_free0 (_tmp84_); #line 598 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp90_); + _g_free0 (_tmp82_); #line 599 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp93_ = new_photo; + _tmp85_ = new_photo; #line 599 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_master (self, _tmp93_); + photo_monitor_update_reimport_master (self, _tmp85_); #line 600 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4131 "PhotoMonitor.c" +#line 4234 "PhotoMonitor.c" } #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 4135 "PhotoMonitor.c" +#line 4238 "PhotoMonitor.c" { - LibraryPhoto* _tmp94_; - gchar* _tmp95_; - gchar* _tmp96_; - gchar* _tmp97_; - gchar* _tmp98_; - LibraryPhoto* _tmp99_; + LibraryPhoto* _tmp86_; + gchar* _tmp87_; + gchar* _tmp88_; + gchar* _tmp89_; + gchar* _tmp90_; + LibraryPhoto* _tmp91_; #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp94_ = new_photo; + _tmp86_ = new_photo; #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp95_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_DATA_OBJECT, DataObject)); + _tmp87_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_DATA_OBJECT, DataObject)); #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp96_ = _tmp95_; + _tmp88_ = _tmp87_; #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp97_ = g_strdup_printf ("Will reimport editable file for %s", _tmp96_); + _tmp89_ = g_strdup_printf ("Will reimport editable file for %s", _tmp88_); #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp98_ = _tmp97_; + _tmp90_ = _tmp89_; #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp98_); + media_monitor_mdbg (_tmp90_); #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp98_); + _g_free0 (_tmp90_); #line 603 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp96_); + _g_free0 (_tmp88_); #line 604 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp99_ = new_photo; + _tmp91_ = new_photo; #line 604 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_editable (self, _tmp99_); + photo_monitor_update_reimport_editable (self, _tmp91_); #line 605 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4165 "PhotoMonitor.c" +#line 4268 "PhotoMonitor.c" } #line 594 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 4169 "PhotoMonitor.c" +#line 4272 "PhotoMonitor.c" { - LibraryPhoto* _tmp100_; - gchar* _tmp101_; - gchar* _tmp102_; - gchar* _tmp103_; - gchar* _tmp104_; - LibraryPhoto* _tmp105_; + LibraryPhoto* _tmp92_; + gchar* _tmp93_; + gchar* _tmp94_; + gchar* _tmp95_; + gchar* _tmp96_; + LibraryPhoto* _tmp97_; #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp100_ = new_photo; + _tmp92_ = new_photo; #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp101_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, TYPE_DATA_OBJECT, DataObject)); + _tmp93_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, TYPE_DATA_OBJECT, DataObject)); #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp102_ = _tmp101_; + _tmp94_ = _tmp93_; #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp103_ = g_strdup_printf ("Will reimport raw development file for %s", _tmp102_); + _tmp95_ = g_strdup_printf ("Will reimport raw development file for %s", _tmp94_); #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp104_ = _tmp103_; + _tmp96_ = _tmp95_; #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp104_); + media_monitor_mdbg (_tmp96_); #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp104_); + _g_free0 (_tmp96_); #line 608 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp102_); + _g_free0 (_tmp94_); #line 609 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp105_ = new_photo; + _tmp97_ = new_photo; #line 609 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_raw_developments (self, _tmp105_); + photo_monitor_update_reimport_raw_developments (self, _tmp97_); #line 610 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4199 "PhotoMonitor.c" +#line 4302 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp106_; - GEnumValue* _tmp107_; + LibraryPhotoSourceCollectionState _tmp98_; + GEnumValue* _tmp99_; #line 613 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp106_ = new_state; + _tmp98_ = new_state; #line 613 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp107_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp106_); + _tmp99_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp98_); #line 613 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:613: Unknown LibraryPhoto collection state %s", (_tmp107_ != NULL) ? _tmp107_->value_name : NULL); -#line 4211 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:613: Unknown LibraryPhoto collection state %s", (_tmp99_ != NULL) ? _tmp99_->value_name : NULL); +#line 4314 "PhotoMonitor.c" } } } @@ -4223,180 +4326,180 @@ static gboolean photo_monitor_real_notify_file_moved (MediaMonitor* base, GFile* _g_object_unref0 (old_photo); #line 617 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4225 "PhotoMonitor.c" +#line 4328 "PhotoMonitor.c" } -static gboolean photo_monitor_real_notify_file_altered (MediaMonitor* base, GFile* file) { +static gboolean +photo_monitor_real_notify_file_altered (MediaMonitor* base, + GFile* file) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState state = 0; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_; + LibraryPhotoSourceCollectionState _tmp3_; #line 620 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 620 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 622 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 622 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + state = _tmp0_; #line 622 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; -#line 622 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp2_; + photo = _tmp1_; #line 623 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; + _tmp2_ = photo; #line 623 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 624 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = FALSE; #line 624 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); #line 624 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4261 "PhotoMonitor.c" +#line 4364 "PhotoMonitor.c" } #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = state; + _tmp3_ = state; #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: -#line 4273 "PhotoMonitor.c" +#line 4376 "PhotoMonitor.c" { - LibraryPhoto* _tmp5_; + LibraryPhoto* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; + LibraryPhoto* _tmp9_; LibraryPhoto* _tmp10_; - LibraryPhoto* _tmp11_; #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; + _tmp4_ = photo; #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = g_strdup_printf ("Will reimport master for %s", _tmp7_); + _tmp7_ = g_strdup_printf ("Will reimport master for %s", _tmp6_); #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp9_); + media_monitor_mdbg (_tmp8_); #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 630 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 631 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; + _tmp9_ = photo; #line 631 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_master (self, _tmp10_); + photo_monitor_update_reimport_master (self, _tmp9_); #line 632 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo; + _tmp10_ = photo; #line 632 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MONITORABLE, Monitorable), TRUE); + media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MONITORABLE, Monitorable), TRUE); #line 633 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4308 "PhotoMonitor.c" +#line 4411 "PhotoMonitor.c" } #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 4312 "PhotoMonitor.c" +#line 4415 "PhotoMonitor.c" { - LibraryPhoto* _tmp12_; + LibraryPhoto* _tmp11_; + gchar* _tmp12_; gchar* _tmp13_; gchar* _tmp14_; gchar* _tmp15_; - gchar* _tmp16_; + LibraryPhoto* _tmp16_; LibraryPhoto* _tmp17_; - LibraryPhoto* _tmp18_; #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = photo; + _tmp11_ = photo; #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); + _tmp12_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = g_strdup_printf ("Will reimport editable for %s", _tmp14_); + _tmp14_ = g_strdup_printf ("Will reimport editable for %s", _tmp13_); #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp16_); + media_monitor_mdbg (_tmp15_); #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp15_); #line 636 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp13_); #line 637 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = photo; + _tmp16_ = photo; #line 637 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_editable (self, _tmp17_); + photo_monitor_update_reimport_editable (self, _tmp16_); #line 638 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = photo; + _tmp17_ = photo; #line 638 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_in_alteration (self, _tmp18_, TRUE); + photo_monitor_update_editable_file_in_alteration (self, _tmp17_, TRUE); #line 639 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4347 "PhotoMonitor.c" +#line 4450 "PhotoMonitor.c" } #line 626 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 4351 "PhotoMonitor.c" +#line 4454 "PhotoMonitor.c" { - LibraryPhoto* _tmp19_; + LibraryPhoto* _tmp18_; + gchar* _tmp19_; gchar* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; - gchar* _tmp23_; + LibraryPhoto* _tmp23_; LibraryPhoto* _tmp24_; - LibraryPhoto* _tmp25_; #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = photo; + _tmp18_ = photo; #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject)); + _tmp19_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject)); #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = g_strdup_printf ("Will reimport raw development for %s", _tmp21_); + _tmp21_ = g_strdup_printf ("Will reimport raw development for %s", _tmp20_); #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = _tmp22_; + _tmp22_ = _tmp21_; #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp23_); + media_monitor_mdbg (_tmp22_); #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp22_); #line 642 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp20_); #line 643 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = photo; + _tmp23_ = photo; #line 643 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_reimport_raw_developments (self, _tmp24_); + photo_monitor_update_reimport_raw_developments (self, _tmp23_); #line 644 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = photo; + _tmp24_ = photo; #line 644 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_in_alteration (self, _tmp25_, TRUE); + photo_monitor_update_raw_development_file_in_alteration (self, _tmp24_, TRUE); #line 645 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4386 "PhotoMonitor.c" +#line 4489 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp26_; - GEnumValue* _tmp27_; + LibraryPhotoSourceCollectionState _tmp25_; + GEnumValue* _tmp26_; #line 648 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = state; + _tmp25_ = state; #line 648 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp26_); + _tmp26_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp25_); #line 648 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:648: Unknown LibraryPhoto collection state %s", (_tmp27_ != NULL) ? _tmp27_->value_name : NULL); -#line 4398 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:648: Unknown LibraryPhoto collection state %s", (_tmp26_ != NULL) ? _tmp26_->value_name : NULL); +#line 4501 "PhotoMonitor.c" } } #line 651 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -4405,210 +4508,207 @@ static gboolean photo_monitor_real_notify_file_altered (MediaMonitor* base, GFil _g_object_unref0 (photo); #line 651 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4407 "PhotoMonitor.c" +#line 4510 "PhotoMonitor.c" } -static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor* base, GFile* file) { +static gboolean +photo_monitor_real_notify_file_attributes_altered (MediaMonitor* base, + GFile* file) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState state = 0; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_; + LibraryPhotoSourceCollectionState _tmp3_; #line 654 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 654 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 656 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 656 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + state = _tmp0_; #line 656 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; -#line 656 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp2_; + photo = _tmp1_; #line 657 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; + _tmp2_ = photo; #line 657 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 658 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = FALSE; #line 658 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); #line 658 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4443 "PhotoMonitor.c" +#line 4546 "PhotoMonitor.c" } #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = state; + _tmp3_ = state; #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: -#line 4453 "PhotoMonitor.c" +#line 4556 "PhotoMonitor.c" { - LibraryPhoto* _tmp5_; + LibraryPhoto* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; + LibraryPhoto* _tmp9_; LibraryPhoto* _tmp10_; - LibraryPhoto* _tmp11_; #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; + _tmp4_ = photo; #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = g_strdup_printf ("Will update master file info for %s", _tmp7_); + _tmp7_ = g_strdup_printf ("Will update master file info for %s", _tmp6_); #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp9_); + media_monitor_mdbg (_tmp8_); #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 663 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 664 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; + _tmp9_ = photo; #line 664 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_info_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_master_file_info_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MONITORABLE, Monitorable)); #line 665 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo; + _tmp10_ = photo; #line 665 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MONITORABLE, Monitorable), TRUE); + media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MONITORABLE, Monitorable), TRUE); #line 666 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4488 "PhotoMonitor.c" +#line 4591 "PhotoMonitor.c" } #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 4492 "PhotoMonitor.c" +#line 4595 "PhotoMonitor.c" { - GFile* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - LibraryPhotoSourceCollectionState _tmp15_; - GEnumValue* _tmp16_; - LibraryPhoto* _tmp17_; -#line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = file; + gchar* _tmp11_; + gchar* _tmp12_; + LibraryPhotoSourceCollectionState _tmp13_; + GEnumValue* _tmp14_; + LibraryPhoto* _tmp15_; #line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = g_file_get_path (_tmp12_); + _tmp11_ = g_file_get_path (file); #line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = state; + _tmp13_ = state; #line 671 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp15_); + _tmp14_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp13_); #line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_warning ("PhotoMonitor.vala:670: File %s attributes altered in %s state", _tmp14_, (_tmp16_ != NULL) ? _tmp16_->value_name : NULL); + g_warning ("PhotoMonitor.vala:670: File %s attributes altered in %s state", _tmp12_, (_tmp14_ != NULL) ? _tmp14_->value_name : NULL); #line 670 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp12_); #line 672 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = photo; + _tmp15_ = photo; #line 672 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MONITORABLE, Monitorable), TRUE); + media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MONITORABLE, Monitorable), TRUE); #line 673 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4520 "PhotoMonitor.c" +#line 4620 "PhotoMonitor.c" } #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 4524 "PhotoMonitor.c" +#line 4624 "PhotoMonitor.c" { - LibraryPhoto* _tmp18_; + LibraryPhoto* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; gchar* _tmp19_; gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; - LibraryPhoto* _tmp23_; - LibraryPhoto* _tmp24_; -#line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = photo; + LibraryPhoto* _tmp21_; + LibraryPhoto* _tmp22_; #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject)); + _tmp16_ = photo; #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = _tmp19_; + _tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = g_strdup_printf ("Will update editable file info for %s", _tmp20_); + _tmp18_ = _tmp17_; #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = _tmp21_; + _tmp19_ = g_strdup_printf ("Will update editable file info for %s", _tmp18_); #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp22_); + _tmp20_ = _tmp19_; #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp22_); + media_monitor_mdbg (_tmp20_); #line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_free0 (_tmp20_); +#line 676 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" + _g_free0 (_tmp18_); #line 677 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = photo; + _tmp21_ = photo; #line 677 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_info_altered (self, _tmp23_); + photo_monitor_update_editable_file_info_altered (self, _tmp21_); #line 678 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = photo; + _tmp22_ = photo; #line 678 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_in_alteration (self, _tmp24_, TRUE); + photo_monitor_update_editable_file_in_alteration (self, _tmp22_, TRUE); #line 679 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4559 "PhotoMonitor.c" +#line 4659 "PhotoMonitor.c" } #line 660 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 4563 "PhotoMonitor.c" +#line 4663 "PhotoMonitor.c" { - LibraryPhoto* _tmp25_; + LibraryPhoto* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; gchar* _tmp26_; gchar* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - LibraryPhoto* _tmp30_; - LibraryPhoto* _tmp31_; -#line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = photo; + LibraryPhoto* _tmp28_; + LibraryPhoto* _tmp29_; #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); + _tmp23_ = photo; #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = _tmp26_; + _tmp24_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_OBJECT, DataObject)); #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = g_strdup_printf ("Will update raw development file info for %s", _tmp27_); + _tmp25_ = _tmp24_; #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = _tmp28_; + _tmp26_ = g_strdup_printf ("Will update raw development file info for %s", _tmp25_); #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp29_); + _tmp27_ = _tmp26_; #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp29_); + media_monitor_mdbg (_tmp27_); #line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_free0 (_tmp27_); +#line 682 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" + _g_free0 (_tmp25_); #line 683 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = photo; + _tmp28_ = photo; #line 683 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_info_altered (self, _tmp30_); + photo_monitor_update_raw_development_file_info_altered (self, _tmp28_); #line 684 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = photo; + _tmp29_ = photo; #line 684 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_in_alteration (self, _tmp31_, TRUE); + photo_monitor_update_raw_development_file_in_alteration (self, _tmp29_, TRUE); #line 685 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4598 "PhotoMonitor.c" +#line 4698 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp32_; - GEnumValue* _tmp33_; + LibraryPhotoSourceCollectionState _tmp30_; + GEnumValue* _tmp31_; #line 688 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = state; + _tmp30_ = state; #line 688 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp32_); + _tmp31_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp30_); #line 688 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:688: Unknown LibraryPhoto collection state %s", (_tmp33_ != NULL) ? _tmp33_->value_name : NULL); -#line 4610 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:688: Unknown LibraryPhoto collection state %s", (_tmp31_ != NULL) ? _tmp31_->value_name : NULL); +#line 4710 "PhotoMonitor.c" } } #line 691 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -4617,20 +4717,23 @@ static gboolean photo_monitor_real_notify_file_attributes_altered (MediaMonitor* _g_object_unref0 (photo); #line 691 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4619 "PhotoMonitor.c" +#line 4719 "PhotoMonitor.c" } -static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonitor* base, GFile* file, GFileInfo* info) { +static gboolean +photo_monitor_real_notify_file_alteration_completed (MediaMonitor* base, + GFile* file, + GFileInfo* info) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState state = 0; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_; + LibraryPhotoSourceCollectionState _tmp3_; #line 694 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 694 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -4638,89 +4741,81 @@ static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonito #line 694 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); #line 696 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 696 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + state = _tmp0_; #line 696 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; -#line 696 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp2_; + photo = _tmp1_; #line 697 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; + _tmp2_ = photo; #line 697 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 698 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = FALSE; #line 698 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); #line 698 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4657 "PhotoMonitor.c" +#line 4758 "PhotoMonitor.c" } #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = state; + _tmp3_ = state; #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 4669 "PhotoMonitor.c" +#line 4770 "PhotoMonitor.c" { - LibraryPhoto* _tmp5_; - GFileInfo* _tmp6_; + LibraryPhoto* _tmp4_; #line 704 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; -#line 704 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = info; + _tmp4_ = photo; #line 704 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_alterations_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MONITORABLE, Monitorable), _tmp6_); + media_monitor_update_master_file_alterations_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MONITORABLE, Monitorable), info); #line 705 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4681 "PhotoMonitor.c" +#line 4779 "PhotoMonitor.c" } #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 4685 "PhotoMonitor.c" +#line 4783 "PhotoMonitor.c" { - LibraryPhoto* _tmp7_; - GFileInfo* _tmp8_; -#line 708 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = photo; + LibraryPhoto* _tmp5_; #line 708 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = info; + _tmp5_ = photo; #line 708 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_alterations_completed (self, _tmp7_, _tmp8_); + photo_monitor_update_editable_file_alterations_completed (self, _tmp5_, info); #line 709 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4697 "PhotoMonitor.c" +#line 4792 "PhotoMonitor.c" } #line 700 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 4701 "PhotoMonitor.c" +#line 4796 "PhotoMonitor.c" { - LibraryPhoto* _tmp9_; + LibraryPhoto* _tmp6_; #line 712 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = photo; + _tmp6_ = photo; #line 712 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_alterations_completed (self, _tmp9_); + photo_monitor_update_raw_development_file_alterations_completed (self, _tmp6_); #line 713 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4710 "PhotoMonitor.c" +#line 4805 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp10_; - GEnumValue* _tmp11_; + LibraryPhotoSourceCollectionState _tmp7_; + GEnumValue* _tmp8_; #line 716 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = state; + _tmp7_ = state; #line 716 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp10_); + _tmp8_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp7_); #line 716 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:716: Unknown LibraryPhoto collection state %s", (_tmp11_ != NULL) ? _tmp11_->value_name : NULL); -#line 4722 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:716: Unknown LibraryPhoto collection state %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL); +#line 4817 "PhotoMonitor.c" } } #line 719 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -4729,196 +4824,196 @@ static gboolean photo_monitor_real_notify_file_alteration_completed (MediaMonito _g_object_unref0 (photo); #line 719 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4731 "PhotoMonitor.c" +#line 4826 "PhotoMonitor.c" } -static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, GFile* file) { +static gboolean +photo_monitor_real_notify_file_deleted (MediaMonitor* base, + GFile* file) +{ PhotoMonitor * self; gboolean result = FALSE; LibraryPhotoSourceCollectionState state = 0; LibraryPhoto* photo = NULL; - GFile* _tmp0_; - LibraryPhotoSourceCollectionState _tmp1_ = 0; + LibraryPhotoSourceCollectionState _tmp0_ = 0; + LibraryPhoto* _tmp1_; LibraryPhoto* _tmp2_; - LibraryPhoto* _tmp3_; - LibraryPhotoSourceCollectionState _tmp4_; + LibraryPhotoSourceCollectionState _tmp3_; #line 722 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 722 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 724 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = file; -#line 724 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = photo_monitor_get_photo_state_by_file (self, _tmp0_, &_tmp1_); + _tmp1_ = photo_monitor_get_photo_state_by_file (self, file, &_tmp0_); #line 724 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - state = _tmp1_; + state = _tmp0_; #line 724 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp2_; + photo = _tmp1_; #line 725 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = photo; + _tmp2_ = photo; #line 725 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 726 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" result = FALSE; #line 726 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); #line 726 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4767 "PhotoMonitor.c" +#line 4862 "PhotoMonitor.c" } #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = state; + _tmp3_ = state; #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - switch (_tmp4_) { + switch (_tmp3_) { #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE: -#line 4775 "PhotoMonitor.c" +#line 4870 "PhotoMonitor.c" { - LibraryPhoto* _tmp5_; + LibraryPhoto* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; + LibraryPhoto* _tmp9_; LibraryPhoto* _tmp10_; - LibraryPhoto* _tmp11_; #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; + _tmp4_ = photo; #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = g_strdup_printf ("Will mark %s offline", _tmp7_); + _tmp7_ = g_strdup_printf ("Will mark %s offline", _tmp6_); #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp9_); + media_monitor_mdbg (_tmp8_); #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 730 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 731 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; + _tmp9_ = photo; #line 731 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MONITORABLE, Monitorable)); #line 732 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo; + _tmp10_ = photo; #line 732 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MONITORABLE, Monitorable), FALSE); + media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MONITORABLE, Monitorable), FALSE); #line 733 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4810 "PhotoMonitor.c" +#line 4905 "PhotoMonitor.c" } #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 4816 "PhotoMonitor.c" +#line 4911 "PhotoMonitor.c" { - LibraryPhoto* _tmp12_; + LibraryPhoto* _tmp11_; #line 738 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = photo; + _tmp11_ = photo; #line 738 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MONITORABLE, Monitorable), FALSE); + media_monitor_update_master_file_in_alteration (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MONITORABLE, Monitorable), FALSE); #line 739 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4825 "PhotoMonitor.c" +#line 4920 "PhotoMonitor.c" } #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: -#line 4829 "PhotoMonitor.c" +#line 4924 "PhotoMonitor.c" { - LibraryPhoto* _tmp13_; + LibraryPhoto* _tmp12_; + gchar* _tmp13_; gchar* _tmp14_; gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; + LibraryPhoto* _tmp17_; LibraryPhoto* _tmp18_; - LibraryPhoto* _tmp19_; #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = photo; + _tmp12_ = photo; #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); + _tmp13_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = g_strdup_printf ("Will revert %s to master", _tmp15_); + _tmp15_ = g_strdup_printf ("Will revert %s to master", _tmp14_); #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp17_); + media_monitor_mdbg (_tmp16_); #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp16_); #line 742 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 743 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = photo; + _tmp17_ = photo; #line 743 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_revert_to_master (self, _tmp18_); + photo_monitor_update_revert_to_master (self, _tmp17_); #line 744 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = photo; + _tmp18_ = photo; #line 744 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_in_alteration (self, _tmp19_, FALSE); + photo_monitor_update_editable_file_in_alteration (self, _tmp18_, FALSE); #line 745 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4864 "PhotoMonitor.c" +#line 4959 "PhotoMonitor.c" } #line 728 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 4868 "PhotoMonitor.c" +#line 4963 "PhotoMonitor.c" { - LibraryPhoto* _tmp20_; + LibraryPhoto* _tmp19_; + gchar* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; gchar* _tmp23_; - gchar* _tmp24_; + LibraryPhoto* _tmp24_; LibraryPhoto* _tmp25_; LibraryPhoto* _tmp26_; - LibraryPhoto* _tmp27_; #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = photo; + _tmp19_ = photo; #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)); + _tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject)); #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = g_strdup_printf ("Will revert %s to master", _tmp22_); + _tmp22_ = g_strdup_printf ("Will revert %s to master", _tmp21_); #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp24_); + media_monitor_mdbg (_tmp23_); #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp23_); #line 748 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp21_); #line 749 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = photo; + _tmp24_ = photo; #line 749 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_revert_to_master (self, _tmp25_); + photo_monitor_update_revert_to_master (self, _tmp24_); #line 750 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = photo; + _tmp25_ = photo; #line 750 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_editable_file_in_alteration (self, _tmp26_, FALSE); + photo_monitor_update_editable_file_in_alteration (self, _tmp25_, FALSE); #line 751 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = photo; + _tmp26_ = photo; #line 751 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_update_raw_development_file_in_alteration (self, _tmp27_, FALSE); + photo_monitor_update_raw_development_file_in_alteration (self, _tmp26_, FALSE); #line 752 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 4908 "PhotoMonitor.c" +#line 5003 "PhotoMonitor.c" } default: { - LibraryPhotoSourceCollectionState _tmp28_; - GEnumValue* _tmp29_; + LibraryPhotoSourceCollectionState _tmp27_; + GEnumValue* _tmp28_; #line 755 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = state; + _tmp27_ = state; #line 755 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp28_); + _tmp28_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _tmp27_); #line 755 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_error ("PhotoMonitor.vala:755: Unknown LibraryPhoto collection state %s", (_tmp29_ != NULL) ? _tmp29_->value_name : NULL); -#line 4920 "PhotoMonitor.c" + g_error ("PhotoMonitor.vala:755: Unknown LibraryPhoto collection state %s", (_tmp28_ != NULL) ? _tmp28_->value_name : NULL); +#line 5015 "PhotoMonitor.c" } } #line 758 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -4927,40 +5022,40 @@ static gboolean photo_monitor_real_notify_file_deleted (MediaMonitor* base, GFil _g_object_unref0 (photo); #line 758 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 4929 "PhotoMonitor.c" +#line 5024 "PhotoMonitor.c" } -static void photo_monitor_real_on_media_source_destroyed (MediaMonitor* base, DataSource* source) { +static void +photo_monitor_real_on_media_source_destroyed (MediaMonitor* base, + DataSource* source) +{ PhotoMonitor * self; - DataSource* _tmp0_; - DataSource* _tmp1_; #line 761 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); #line 761 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 762 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = source; -#line 762 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - MEDIA_MONITOR_CLASS (photo_monitor_parent_class)->on_media_source_destroyed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), _tmp0_); -#line 764 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = source; + MEDIA_MONITOR_CLASS (photo_monitor_parent_class)->on_media_source_destroyed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), source); #line 764 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_monitor_cancel_reimports (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4949 "PhotoMonitor.c" + photo_monitor_cancel_reimports (self, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto)); +#line 5041 "PhotoMonitor.c" } -static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, GFile* file, LibraryPhotoSourceCollectionState* state) { +static LibraryPhoto* +photo_monitor_get_photo_state_by_file (PhotoMonitor* self, + GFile* file, + LibraryPhotoSourceCollectionState* state) +{ LibraryPhotoSourceCollectionState _vala_state = 0; LibraryPhoto* result = NULL; GFile* real_file = NULL; - gboolean _tmp0_; - GFile* _tmp70_ = NULL; - GFile* _tmp71_; - LibraryPhotoSourceCollection* _tmp73_; - LibraryPhotoSourceCollectionState _tmp74_ = 0; - LibraryPhoto* _tmp75_; + GFile* _tmp58_ = NULL; + GFile* _tmp59_; + LibraryPhotoSourceCollection* _tmp60_; + LibraryPhotoSourceCollectionState _tmp61_ = 0; + LibraryPhoto* _tmp62_; #line 767 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL); #line 767 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -4968,89 +5063,84 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, #line 768 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" real_file = NULL; #line 769 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = media_monitor_has_pending_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor)); -#line 769 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp0_) { -#line 4973 "PhotoMonitor.c" + if (media_monitor_has_pending_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor))) { +#line 5066 "PhotoMonitor.c" { GeeIterator* _monitorable_it = NULL; + GeeCollection* _tmp0_; GeeCollection* _tmp1_; - GeeCollection* _tmp2_; + GeeIterator* _tmp2_; GeeIterator* _tmp3_; - GeeIterator* _tmp4_; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = media_monitor_get_monitorables (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor)); + _tmp0_ = media_monitor_get_monitorables (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor)); #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_it = _tmp4_; + _monitorable_it = _tmp3_; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 4994 "PhotoMonitor.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 5087 "PhotoMonitor.c" + GeeIterator* _tmp4_; Monitorable* monitorable = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; + GeeIterator* _tmp5_; + gpointer _tmp6_; LibraryPhoto* photo = NULL; - Monitorable* _tmp9_; - LibraryPhoto* _tmp10_; + Monitorable* _tmp7_; + LibraryPhoto* _tmp8_; PhotoUpdates* updates = NULL; - LibraryPhoto* _tmp11_; - PhotoUpdates* _tmp12_; + LibraryPhoto* _tmp9_; + PhotoUpdates* _tmp10_; + PhotoUpdates* _tmp11_; + gboolean _tmp12_ = FALSE; PhotoUpdates* _tmp13_; - gboolean _tmp14_ = FALSE; - PhotoUpdates* _tmp15_; - GFile* _tmp16_; - GFile* _tmp17_; - gboolean _tmp18_; - gboolean _tmp26_ = FALSE; - PhotoUpdates* _tmp27_; - GFile* _tmp28_; - GFile* _tmp29_; - gboolean _tmp30_; - PhotoUpdates* _tmp39_; - GeeCollection* _tmp40_; - GeeCollection* _tmp41_; - gboolean _tmp42_; -#line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = _monitorable_it; + GFile* _tmp14_; + GFile* _tmp15_; + gboolean _tmp16_; + gboolean _tmp22_ = FALSE; + PhotoUpdates* _tmp23_; + GFile* _tmp24_; + GFile* _tmp25_; + gboolean _tmp26_; + PhotoUpdates* _tmp33_; + GeeCollection* _tmp34_; + GeeCollection* _tmp35_; + gboolean _tmp36_; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp4_ = _monitorable_it; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp4_)) { #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5029 "PhotoMonitor.c" +#line 5119 "PhotoMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _monitorable_it; + _tmp5_ = _monitorable_it; #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - monitorable = (Monitorable*) _tmp8_; + monitorable = (Monitorable*) _tmp6_; #line 771 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = monitorable; + _tmp7_ = monitorable; #line 771 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 771 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = _tmp10_; + photo = _tmp8_; #line 773 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo; + _tmp9_ = photo; #line 773 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = photo_monitor_get_existing_photo_updates (self, _tmp11_); + _tmp10_ = photo_monitor_get_existing_photo_updates (self, _tmp9_); #line 773 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - updates = _tmp12_; + updates = _tmp10_; #line 774 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = updates; + _tmp11_ = updates; #line 774 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp13_ == NULL) { + if (_tmp11_ == NULL) { #line 775 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); #line 775 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5059,59 +5149,53 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, _g_object_unref0 (monitorable); #line 775 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" continue; -#line 5061 "PhotoMonitor.c" +#line 5151 "PhotoMonitor.c" } #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = updates; -#line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = monitorable_updates_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); -#line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_; + _tmp13_ = updates; #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = _tmp17_ != NULL; + _tmp14_ = monitorable_updates_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp17_); + _tmp15_ = _tmp14_; #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp18_) { -#line 5075 "PhotoMonitor.c" - PhotoUpdates* _tmp19_; - GFile* _tmp20_; - GFile* _tmp21_; - GFile* _tmp22_; - gboolean _tmp23_; + _tmp16_ = _tmp15_ != NULL; #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = updates; + _g_object_unref0 (_tmp15_); #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = monitorable_updates_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); + if (_tmp16_) { +#line 5165 "PhotoMonitor.c" + PhotoUpdates* _tmp17_; + GFile* _tmp18_; + GFile* _tmp19_; #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = _tmp20_; + _tmp17_ = updates; #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = file; + _tmp18_ = monitorable_updates_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MONITORABLE_UPDATES, MonitorableUpdates)); #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = g_file_equal (_tmp21_, _tmp22_); + _tmp19_ = _tmp18_; #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp23_; + _tmp12_ = g_file_equal (_tmp19_, file); #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp21_); -#line 5095 "PhotoMonitor.c" + _g_object_unref0 (_tmp19_); +#line 5179 "PhotoMonitor.c" } else { #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = FALSE; -#line 5099 "PhotoMonitor.c" + _tmp12_ = FALSE; +#line 5183 "PhotoMonitor.c" } #line 777 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp14_) { -#line 5103 "PhotoMonitor.c" - LibraryPhoto* _tmp24_; - GFile* _tmp25_; + if (_tmp12_) { +#line 5187 "PhotoMonitor.c" + LibraryPhoto* _tmp20_; + GFile* _tmp21_; #line 778 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = photo; + _tmp20_ = photo; #line 778 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp21_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_MEDIA_SOURCE, MediaSource)); #line 778 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (real_file); #line 778 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - real_file = _tmp25_; + real_file = _tmp21_; #line 780 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); #line 780 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5120,64 +5204,58 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, _g_object_unref0 (monitorable); #line 780 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5122 "PhotoMonitor.c" +#line 5206 "PhotoMonitor.c" } #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = updates; + _tmp23_ = updates; #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = photo_updates_get_editable_file (_tmp27_); + _tmp24_ = photo_updates_get_editable_file (_tmp23_); #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = _tmp28_; -#line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = _tmp29_ != NULL; -#line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp29_); + _tmp25_ = _tmp24_; #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp30_) { -#line 5136 "PhotoMonitor.c" - PhotoUpdates* _tmp31_; - GFile* _tmp32_; - GFile* _tmp33_; - GFile* _tmp34_; - gboolean _tmp35_; + _tmp26_ = _tmp25_ != NULL; #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = updates; + _g_object_unref0 (_tmp25_); #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = photo_updates_get_editable_file (_tmp31_); + if (_tmp26_) { +#line 5220 "PhotoMonitor.c" + PhotoUpdates* _tmp27_; + GFile* _tmp28_; + GFile* _tmp29_; #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = _tmp32_; + _tmp27_ = updates; #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp34_ = file; + _tmp28_ = photo_updates_get_editable_file (_tmp27_); #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = g_file_equal (_tmp33_, _tmp34_); + _tmp29_ = _tmp28_; #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = _tmp35_; + _tmp22_ = g_file_equal (_tmp29_, file); #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp33_); -#line 5156 "PhotoMonitor.c" + _g_object_unref0 (_tmp29_); +#line 5234 "PhotoMonitor.c" } else { #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = FALSE; -#line 5160 "PhotoMonitor.c" + _tmp22_ = FALSE; +#line 5238 "PhotoMonitor.c" } #line 783 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp26_) { -#line 5164 "PhotoMonitor.c" - LibraryPhoto* _tmp36_; - GFile* _tmp37_; - GFile* _tmp38_; + if (_tmp22_) { +#line 5242 "PhotoMonitor.c" + LibraryPhoto* _tmp30_; + GFile* _tmp31_; + GFile* _tmp32_; #line 784 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp36_ = photo; + _tmp30_ = photo; #line 784 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp37_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_PHOTO, Photo)); + _tmp31_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PHOTO, Photo)); #line 784 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (real_file); #line 784 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - real_file = _tmp37_; + real_file = _tmp31_; #line 788 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp38_ = real_file; + _tmp32_ = real_file; #line 788 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp38_ == NULL) { + if (_tmp32_ == NULL) { #line 789 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE; #line 791 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5194,11 +5272,11 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, if (state) { #line 791 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *state = _vala_state; -#line 5196 "PhotoMonitor.c" +#line 5274 "PhotoMonitor.c" } #line 791 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 5200 "PhotoMonitor.c" +#line 5278 "PhotoMonitor.c" } #line 794 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); @@ -5208,189 +5286,171 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, _g_object_unref0 (monitorable); #line 794 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5210 "PhotoMonitor.c" +#line 5288 "PhotoMonitor.c" } #line 797 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp39_ = updates; + _tmp33_ = updates; #line 797 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp40_ = photo_updates_get_raw_developer_files (_tmp39_); + _tmp34_ = photo_updates_get_raw_developer_files (_tmp33_); #line 797 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp41_ = _tmp40_; + _tmp35_ = _tmp34_; #line 797 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp42_ = _tmp41_ != NULL; + _tmp36_ = _tmp35_ != NULL; #line 797 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp41_); + _g_object_unref0 (_tmp35_); #line 797 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp42_) { -#line 5224 "PhotoMonitor.c" + if (_tmp36_) { +#line 5302 "PhotoMonitor.c" gboolean found = FALSE; - gboolean _tmp55_; + gboolean _tmp46_; #line 798 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" found = FALSE; -#line 5229 "PhotoMonitor.c" +#line 5307 "PhotoMonitor.c" { GeeIterator* _raw_it = NULL; - PhotoUpdates* _tmp43_; - GeeCollection* _tmp44_; - GeeCollection* _tmp45_; - GeeIterator* _tmp46_; - GeeIterator* _tmp47_; + PhotoUpdates* _tmp37_; + GeeCollection* _tmp38_; + GeeCollection* _tmp39_; + GeeIterator* _tmp40_; + GeeIterator* _tmp41_; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp43_ = updates; + _tmp37_ = updates; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp44_ = photo_updates_get_raw_developer_files (_tmp43_); + _tmp38_ = photo_updates_get_raw_developer_files (_tmp37_); #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp45_ = _tmp44_; + _tmp39_ = _tmp38_; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp40_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ITERABLE, GeeIterable)); #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp47_ = _tmp46_; + _tmp41_ = _tmp40_; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp45_); + _g_object_unref0 (_tmp39_); #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _raw_it = _tmp47_; + _raw_it = _tmp41_; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 5253 "PhotoMonitor.c" - GeeIterator* _tmp48_; - gboolean _tmp49_; +#line 5331 "PhotoMonitor.c" + GeeIterator* _tmp42_; GFile* raw = NULL; - GeeIterator* _tmp50_; - gpointer _tmp51_; - GFile* _tmp52_; - GFile* _tmp53_; - gboolean _tmp54_; -#line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp48_ = _raw_it; + GeeIterator* _tmp43_; + gpointer _tmp44_; + GFile* _tmp45_; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp49_ = gee_iterator_next (_tmp48_); + _tmp42_ = _raw_it; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp49_) { + if (!gee_iterator_next (_tmp42_)) { #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5270 "PhotoMonitor.c" +#line 5343 "PhotoMonitor.c" } #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp50_ = _raw_it; + _tmp43_ = _raw_it; #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp51_ = gee_iterator_get (_tmp50_); + _tmp44_ = gee_iterator_get (_tmp43_); #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - raw = (GFile*) _tmp51_; -#line 800 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp52_ = raw; -#line 800 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp53_ = file; + raw = (GFile*) _tmp44_; #line 800 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp54_ = g_file_equal (_tmp52_, _tmp53_); + _tmp45_ = raw; #line 800 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp54_) { + if (g_file_equal (_tmp45_, file)) { #line 801 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" found = TRUE; #line 803 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (raw); #line 803 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5292 "PhotoMonitor.c" +#line 5361 "PhotoMonitor.c" } #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (raw); -#line 5296 "PhotoMonitor.c" +#line 5365 "PhotoMonitor.c" } #line 799 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_raw_it); -#line 5300 "PhotoMonitor.c" +#line 5369 "PhotoMonitor.c" } #line 807 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp55_ = found; + _tmp46_ = found; #line 807 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp55_) { -#line 5306 "PhotoMonitor.c" + if (_tmp46_) { +#line 5375 "PhotoMonitor.c" GeeCollection* developed = NULL; - LibraryPhoto* _tmp56_; - GeeCollection* _tmp57_; - GeeCollection* _tmp58_; + LibraryPhoto* _tmp47_; + GeeCollection* _tmp48_; + GeeCollection* _tmp49_; #line 808 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp56_ = photo; + _tmp47_ = photo; #line 808 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp57_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PHOTO, Photo)); + _tmp48_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO, Photo)); #line 808 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - developed = _tmp57_; + developed = _tmp48_; #line 809 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp58_ = developed; + _tmp49_ = developed; #line 809 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp58_ != NULL) { -#line 5321 "PhotoMonitor.c" + if (_tmp49_ != NULL) { +#line 5390 "PhotoMonitor.c" { GeeIterator* _f_it = NULL; - GeeCollection* _tmp59_; - GeeIterator* _tmp60_; + GeeCollection* _tmp50_; + GeeIterator* _tmp51_; #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp59_ = developed; + _tmp50_ = developed; #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp51_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ITERABLE, GeeIterable)); #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _f_it = _tmp60_; + _f_it = _tmp51_; #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 5334 "PhotoMonitor.c" - GeeIterator* _tmp61_; - gboolean _tmp62_; +#line 5403 "PhotoMonitor.c" + GeeIterator* _tmp52_; GFile* f = NULL; - GeeIterator* _tmp63_; - gpointer _tmp64_; - GFile* _tmp65_; - GFile* _tmp66_; - gboolean _tmp67_; + GeeIterator* _tmp53_; + gpointer _tmp54_; + GFile* _tmp55_; #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp61_ = _f_it; + _tmp52_ = _f_it; #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp62_ = gee_iterator_next (_tmp61_); -#line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp62_) { + if (!gee_iterator_next (_tmp52_)) { #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5351 "PhotoMonitor.c" +#line 5415 "PhotoMonitor.c" } #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp63_ = _f_it; + _tmp53_ = _f_it; #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp64_ = gee_iterator_get (_tmp63_); + _tmp54_ = gee_iterator_get (_tmp53_); #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - f = (GFile*) _tmp64_; -#line 811 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp65_ = f; + f = (GFile*) _tmp54_; #line 811 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp66_ = file; + _tmp55_ = f; #line 811 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp67_ = g_file_equal (_tmp65_, _tmp66_); -#line 811 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp67_) { -#line 5367 "PhotoMonitor.c" - GFile* _tmp68_; - GFile* _tmp69_; + if (g_file_equal (_tmp55_, file)) { +#line 5427 "PhotoMonitor.c" + GFile* _tmp56_; + GFile* _tmp57_; #line 812 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp68_ = f; + _tmp56_ = f; #line 812 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp69_ = _g_object_ref0 (_tmp68_); + _tmp57_ = _g_object_ref0 (_tmp56_); #line 812 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (real_file); #line 812 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - real_file = _tmp69_; + real_file = _tmp57_; #line 813 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER; #line 815 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (f); #line 815 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5384 "PhotoMonitor.c" +#line 5444 "PhotoMonitor.c" } #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (f); -#line 5388 "PhotoMonitor.c" +#line 5448 "PhotoMonitor.c" } #line 810 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_f_it); -#line 5392 "PhotoMonitor.c" +#line 5452 "PhotoMonitor.c" } } #line 821 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5403,7 +5463,7 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, _g_object_unref0 (monitorable); #line 821 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 5405 "PhotoMonitor.c" +#line 5465 "PhotoMonitor.c" } } #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5412,414 +5472,379 @@ static LibraryPhoto* photo_monitor_get_photo_state_by_file (PhotoMonitor* self, _g_object_unref0 (photo); #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (monitorable); -#line 5414 "PhotoMonitor.c" +#line 5474 "PhotoMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_monitorable_it); -#line 5418 "PhotoMonitor.c" +#line 5478 "PhotoMonitor.c" } } #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp71_ = real_file; + _tmp59_ = real_file; #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp70_ = _tmp71_; + _tmp58_ = _tmp59_; #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp70_ == NULL) { -#line 5427 "PhotoMonitor.c" - GFile* _tmp72_; -#line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp72_ = file; + if (_tmp58_ == NULL) { #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp70_ = _tmp72_; -#line 5433 "PhotoMonitor.c" + _tmp58_ = file; +#line 5489 "PhotoMonitor.c" } #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp73_ = library_photo_global; + _tmp60_ = library_photo_global; #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp75_ = library_photo_source_collection_get_state_by_file (_tmp73_, _tmp70_, &_tmp74_); + _tmp62_ = library_photo_source_collection_get_state_by_file (_tmp60_, _tmp58_, &_tmp61_); #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_state = _tmp74_; + _vala_state = _tmp61_; #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = _tmp75_; + result = _tmp62_; #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (real_file); #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (state) { #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" *state = _vala_state; -#line 5449 "PhotoMonitor.c" +#line 5505 "PhotoMonitor.c" } #line 827 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 5453 "PhotoMonitor.c" +#line 5509 "PhotoMonitor.c" } -PhotoUpdates* photo_monitor_fetch_photo_updates (PhotoMonitor* self, LibraryPhoto* photo) { +PhotoUpdates* +photo_monitor_fetch_photo_updates (PhotoMonitor* self, + LibraryPhoto* photo) +{ PhotoUpdates* result = NULL; - LibraryPhoto* _tmp0_; - MonitorableUpdates* _tmp1_; + MonitorableUpdates* _tmp0_; #line 830 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL); #line 830 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 831 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 831 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = media_monitor_fetch_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE, Monitorable)); + _tmp0_ = media_monitor_fetch_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MONITORABLE, Monitorable)); #line 831 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_UPDATES, PhotoUpdates); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_UPDATES, PhotoUpdates); #line 831 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 5473 "PhotoMonitor.c" +#line 5529 "PhotoMonitor.c" } -PhotoUpdates* photo_monitor_get_existing_photo_updates (PhotoMonitor* self, LibraryPhoto* photo) { +PhotoUpdates* +photo_monitor_get_existing_photo_updates (PhotoMonitor* self, + LibraryPhoto* photo) +{ PhotoUpdates* result = NULL; - LibraryPhoto* _tmp0_; - MonitorableUpdates* _tmp1_; - PhotoUpdates* _tmp2_; + MonitorableUpdates* _tmp0_; + PhotoUpdates* _tmp1_; #line 834 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL); #line 834 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = media_monitor_get_existing_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MONITORABLE, Monitorable)); #line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = media_monitor_get_existing_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MONITORABLE, Monitorable)); + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_UPDATES) ? ((PhotoUpdates*) _tmp0_) : NULL; #line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_PHOTO_UPDATES) ? ((PhotoUpdates*) _tmp1_) : NULL; + if (_tmp1_ == NULL) { #line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp2_ == NULL) { -#line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp1_); -#line 5496 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp0_); +#line 5552 "PhotoMonitor.c" } #line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 835 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 5502 "PhotoMonitor.c" +#line 5558 "PhotoMonitor.c" } -void photo_monitor_update_reimport_master (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_reimport_master (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - GeeHashMap* _tmp3_; - LibraryPhoto* _tmp4_; - gboolean _tmp5_; + GeeHashMap* _tmp2_; #line 838 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 838 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 839 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 839 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 839 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 839 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_reimport_master (_tmp2_, TRUE); + photo_updates_set_reimport_master (_tmp1_, TRUE); #line 839 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 842 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = self->priv->master_reimport_pending; + _monitorable_updates_unref0 (_tmp1_); #line 842 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = photo; -#line 842 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp2_ = self->priv->master_reimport_pending; #line 842 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp5_) { -#line 5535 "PhotoMonitor.c" - GeeHashMap* _tmp6_; - LibraryPhoto* _tmp7_; - gpointer _tmp8_; - PhotoMonitorReimportMasterJob* _tmp9_; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo)) { +#line 5585 "PhotoMonitor.c" + GeeHashMap* _tmp3_; + gpointer _tmp4_; + PhotoMonitorReimportMasterJob* _tmp5_; #line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = self->priv->master_reimport_pending; + _tmp3_ = self->priv->master_reimport_pending; #line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = photo; -#line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = (PhotoMonitorReimportMasterJob*) _tmp8_; + _tmp5_ = (PhotoMonitorReimportMasterJob*) _tmp4_; #line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 843 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _background_job_unref0 (_tmp9_); -#line 5552 "PhotoMonitor.c" + _background_job_unref0 (_tmp5_); +#line 5599 "PhotoMonitor.c" } } -void photo_monitor_update_reimport_editable (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_reimport_editable (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - GeeHashMap* _tmp3_; - LibraryPhoto* _tmp4_; - gboolean _tmp5_; + GeeHashMap* _tmp2_; #line 846 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 846 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 847 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 847 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp1_ = _tmp0_; #line 847 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; -#line 847 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_reimport_editable (_tmp2_, TRUE); + photo_updates_set_reimport_editable (_tmp1_, TRUE); #line 847 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 850 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = self->priv->editable_reimport_pending; -#line 850 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = photo; + _monitorable_updates_unref0 (_tmp1_); #line 850 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp2_ = self->priv->editable_reimport_pending; #line 850 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp5_) { -#line 5586 "PhotoMonitor.c" - GeeHashMap* _tmp6_; - LibraryPhoto* _tmp7_; - gpointer _tmp8_; - PhotoMonitorReimportEditableJob* _tmp9_; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo)) { +#line 5627 "PhotoMonitor.c" + GeeHashMap* _tmp3_; + gpointer _tmp4_; + PhotoMonitorReimportEditableJob* _tmp5_; #line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = self->priv->editable_reimport_pending; + _tmp3_ = self->priv->editable_reimport_pending; #line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = photo; -#line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = (PhotoMonitorReimportEditableJob*) _tmp8_; + _tmp5_ = (PhotoMonitorReimportEditableJob*) _tmp4_; #line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 851 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _background_job_unref0 (_tmp9_); -#line 5603 "PhotoMonitor.c" + _background_job_unref0 (_tmp5_); +#line 5641 "PhotoMonitor.c" } } -void photo_monitor_update_reimport_raw_developments (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_reimport_raw_developments (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - GeeHashMap* _tmp3_; - LibraryPhoto* _tmp4_; - gboolean _tmp5_; + GeeHashMap* _tmp2_; #line 854 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 854 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 855 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 855 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp1_ = _tmp0_; #line 855 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + photo_updates_set_reimport_raw_developments (_tmp1_, TRUE); #line 855 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_reimport_raw_developments (_tmp2_, TRUE); -#line 855 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 858 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = self->priv->raw_developments_reimport_pending; + _monitorable_updates_unref0 (_tmp1_); #line 858 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = photo; -#line 858 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp2_ = self->priv->raw_developments_reimport_pending; #line 858 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp5_) { -#line 5637 "PhotoMonitor.c" - GeeHashMap* _tmp6_; - LibraryPhoto* _tmp7_; - gpointer _tmp8_; - PhotoMonitorReimportRawDevelopmentJob* _tmp9_; -#line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = self->priv->raw_developments_reimport_pending; + if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo)) { +#line 5669 "PhotoMonitor.c" + GeeHashMap* _tmp3_; + gpointer _tmp4_; + PhotoMonitorReimportRawDevelopmentJob* _tmp5_; #line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = photo; + _tmp3_ = self->priv->raw_developments_reimport_pending; #line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo); #line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = (PhotoMonitorReimportRawDevelopmentJob*) _tmp8_; + _tmp5_ = (PhotoMonitorReimportRawDevelopmentJob*) _tmp4_; #line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_BACKGROUND_JOB, BackgroundJob)); + background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 859 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _background_job_unref0 (_tmp9_); -#line 5654 "PhotoMonitor.c" + _background_job_unref0 (_tmp5_); +#line 5683 "PhotoMonitor.c" } } -GFile* photo_monitor_get_editable_file (PhotoMonitor* self, LibraryPhoto* photo) { +GFile* +photo_monitor_get_editable_file (PhotoMonitor* self, + LibraryPhoto* photo) +{ GFile* result = NULL; PhotoUpdates* updates = NULL; - LibraryPhoto* _tmp0_; - PhotoUpdates* _tmp1_; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - PhotoUpdates* _tmp4_; + PhotoUpdates* _tmp0_; + GFile* _tmp1_ = NULL; + gboolean _tmp2_ = FALSE; + PhotoUpdates* _tmp3_; #line 862 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL); #line 862 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 863 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 863 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_get_existing_photo_updates (self, _tmp0_); + _tmp0_ = photo_monitor_get_existing_photo_updates (self, photo); #line 863 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - updates = _tmp1_; + updates = _tmp0_; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = updates; + _tmp3_ = updates; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp4_ != NULL) { -#line 5681 "PhotoMonitor.c" - PhotoUpdates* _tmp5_; + if (_tmp3_ != NULL) { +#line 5710 "PhotoMonitor.c" + PhotoUpdates* _tmp4_; + GFile* _tmp5_; GFile* _tmp6_; - GFile* _tmp7_; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = updates; + _tmp4_ = updates; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = photo_updates_get_editable_file (_tmp5_); + _tmp5_ = photo_updates_get_editable_file (_tmp4_); #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp7_ != NULL; + _tmp2_ = _tmp6_ != NULL; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp7_); -#line 5695 "PhotoMonitor.c" + _g_object_unref0 (_tmp6_); +#line 5724 "PhotoMonitor.c" } else { #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = FALSE; -#line 5699 "PhotoMonitor.c" + _tmp2_ = FALSE; +#line 5728 "PhotoMonitor.c" } #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_) { -#line 5703 "PhotoMonitor.c" - PhotoUpdates* _tmp8_; - GFile* _tmp9_; + if (_tmp2_) { +#line 5732 "PhotoMonitor.c" + PhotoUpdates* _tmp7_; + GFile* _tmp8_; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = updates; + _tmp7_ = updates; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = photo_updates_get_editable_file (_tmp8_); + _tmp8_ = photo_updates_get_editable_file (_tmp7_); #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp9_; -#line 5714 "PhotoMonitor.c" + _tmp1_ = _tmp8_; +#line 5743 "PhotoMonitor.c" } else { - LibraryPhoto* _tmp10_; - GFile* _tmp11_; -#line 866 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; + GFile* _tmp9_; #line 866 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO, Photo)); + _tmp9_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 866 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 866 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp11_; -#line 5726 "PhotoMonitor.c" + _tmp1_ = _tmp9_; +#line 5752 "PhotoMonitor.c" } #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); #line 865 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 5734 "PhotoMonitor.c" +#line 5760 "PhotoMonitor.c" } -GeeCollection* photo_monitor_get_raw_development_files (PhotoMonitor* self, LibraryPhoto* photo) { +GeeCollection* +photo_monitor_get_raw_development_files (PhotoMonitor* self, + LibraryPhoto* photo) +{ GeeCollection* result = NULL; PhotoUpdates* updates = NULL; - LibraryPhoto* _tmp0_; - PhotoUpdates* _tmp1_; - GeeCollection* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - PhotoUpdates* _tmp4_; + PhotoUpdates* _tmp0_; + GeeCollection* _tmp1_ = NULL; + gboolean _tmp2_ = FALSE; + PhotoUpdates* _tmp3_; #line 869 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (self), NULL); #line 869 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 870 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_get_existing_photo_updates (self, photo); #line 870 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_get_existing_photo_updates (self, _tmp0_); -#line 870 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - updates = _tmp1_; + updates = _tmp0_; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = updates; + _tmp3_ = updates; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp4_ != NULL) { -#line 5760 "PhotoMonitor.c" - PhotoUpdates* _tmp5_; + if (_tmp3_ != NULL) { +#line 5786 "PhotoMonitor.c" + PhotoUpdates* _tmp4_; + GeeCollection* _tmp5_; GeeCollection* _tmp6_; - GeeCollection* _tmp7_; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = updates; + _tmp4_ = updates; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = photo_updates_get_raw_developer_files (_tmp5_); + _tmp5_ = photo_updates_get_raw_developer_files (_tmp4_); #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp7_ != NULL; + _tmp2_ = _tmp6_ != NULL; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp7_); -#line 5774 "PhotoMonitor.c" + _g_object_unref0 (_tmp6_); +#line 5800 "PhotoMonitor.c" } else { #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = FALSE; -#line 5778 "PhotoMonitor.c" + _tmp2_ = FALSE; +#line 5804 "PhotoMonitor.c" } #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp3_) { -#line 5782 "PhotoMonitor.c" - PhotoUpdates* _tmp8_; - GeeCollection* _tmp9_; + if (_tmp2_) { +#line 5808 "PhotoMonitor.c" + PhotoUpdates* _tmp7_; + GeeCollection* _tmp8_; #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = updates; + _tmp7_ = updates; #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = photo_updates_get_raw_developer_files (_tmp8_); + _tmp8_ = photo_updates_get_raw_developer_files (_tmp7_); #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp9_; -#line 5793 "PhotoMonitor.c" + _tmp1_ = _tmp8_; +#line 5819 "PhotoMonitor.c" } else { - LibraryPhoto* _tmp10_; - GeeCollection* _tmp11_; -#line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = photo; + GeeCollection* _tmp9_; #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO, Photo)); + _tmp9_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 873 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp11_; -#line 5805 "PhotoMonitor.c" + _tmp1_ = _tmp9_; +#line 5828 "PhotoMonitor.c" } #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - result = _tmp2_; + result = _tmp1_; #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); #line 872 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return result; -#line 5813 "PhotoMonitor.c" +#line 5836 "PhotoMonitor.c" } -void photo_monitor_update_editable_file (PhotoMonitor* self, LibraryPhoto* photo, GFile* file) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_editable_file (PhotoMonitor* self, + LibraryPhoto* photo, + GFile* file) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - GFile* _tmp3_; #line 876 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 876 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5827,48 +5852,46 @@ void photo_monitor_update_editable_file (PhotoMonitor* self, LibraryPhoto* photo #line 876 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 877 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 877 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); -#line 877 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 877 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = file; + photo_updates_set_editable_file (_tmp1_, file); #line 877 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_file (_tmp2_, _tmp3_); -#line 877 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 5840 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 5861 "PhotoMonitor.c" } -void photo_monitor_update_editable_file_info_altered (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_editable_file_info_altered (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; #line 880 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 880 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 881 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 881 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp1_ = _tmp0_; #line 881 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + photo_updates_set_editable_file_info_altered (_tmp1_, TRUE); #line 881 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_file_info_altered (_tmp2_, TRUE); -#line 881 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 5862 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 5883 "PhotoMonitor.c" } -void photo_monitor_update_raw_development_file (PhotoMonitor* self, LibraryPhoto* photo, GFile* file) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_raw_development_file (PhotoMonitor* self, + LibraryPhoto* photo, + GFile* file) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - GFile* _tmp3_; #line 884 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 884 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5876,76 +5899,71 @@ void photo_monitor_update_raw_development_file (PhotoMonitor* self, LibraryPhoto #line 884 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 885 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 885 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); -#line 885 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 885 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = file; + _tmp1_ = _tmp0_; #line 885 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_add_raw_developer_file (_tmp2_, _tmp3_); + photo_updates_add_raw_developer_file (_tmp1_, file); #line 885 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 5889 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 5908 "PhotoMonitor.c" } -void photo_monitor_update_raw_development_file_info_altered (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_raw_development_file_info_altered (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; #line 888 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 888 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 889 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 889 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); -#line 889 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 889 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_raw_developer_file_info_altered (_tmp2_, TRUE); + photo_updates_set_raw_developer_file_info_altered (_tmp1_, TRUE); #line 889 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 5911 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 5930 "PhotoMonitor.c" } -void photo_monitor_update_editable_file_in_alteration (PhotoMonitor* self, LibraryPhoto* photo, gboolean in_alteration) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_editable_file_in_alteration (PhotoMonitor* self, + LibraryPhoto* photo, + gboolean in_alteration) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - gboolean _tmp3_; #line 892 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 892 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 893 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 893 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 893 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; -#line 893 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = in_alteration; + _tmp1_ = _tmp0_; #line 893 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_in_alteration (_tmp2_, _tmp3_); + photo_updates_set_editable_in_alteration (_tmp1_, in_alteration); #line 893 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 5936 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 5953 "PhotoMonitor.c" } -void photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* self, + LibraryPhoto* photo, + GFileInfo* info) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; PhotoUpdates* _tmp2_; - GFileInfo* _tmp3_; - LibraryPhoto* _tmp4_; - PhotoUpdates* _tmp5_; - PhotoUpdates* _tmp6_; + PhotoUpdates* _tmp3_; #line 896 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 896 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -5953,111 +5971,109 @@ void photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* sel #line 896 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 897 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 897 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp1_ = _tmp0_; #line 897 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + photo_updates_set_editable_file_info (_tmp1_, info); #line 897 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = info; -#line 897 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_file_info (_tmp2_, _tmp3_); -#line 897 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); + _monitorable_updates_unref0 (_tmp1_); #line 898 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = photo; + _tmp2_ = photo_monitor_fetch_photo_updates (self, photo); #line 898 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo_monitor_fetch_photo_updates (self, _tmp4_); -#line 898 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 898 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_in_alteration (_tmp6_, FALSE); + photo_updates_set_editable_in_alteration (_tmp3_, FALSE); #line 898 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp6_); -#line 5976 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp3_); +#line 5988 "PhotoMonitor.c" } -void photo_monitor_update_raw_development_file_in_alteration (PhotoMonitor* self, LibraryPhoto* photo, gboolean in_alteration) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_raw_development_file_in_alteration (PhotoMonitor* self, + LibraryPhoto* photo, + gboolean in_alteration) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; - gboolean _tmp3_; #line 901 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 901 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 902 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 902 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp1_ = _tmp0_; #line 902 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + photo_updates_set_raw_development_in_alteration (_tmp1_, in_alteration); #line 902 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = in_alteration; -#line 902 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_raw_development_in_alteration (_tmp2_, _tmp3_); -#line 902 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 6001 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 6011 "PhotoMonitor.c" } -void photo_monitor_update_raw_development_file_alterations_completed (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_raw_development_file_alterations_completed (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; #line 905 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 905 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 906 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 906 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp1_ = _tmp0_; #line 906 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; -#line 906 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_raw_development_in_alteration (_tmp2_, FALSE); + photo_updates_set_raw_development_in_alteration (_tmp1_, FALSE); #line 906 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 6023 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 6033 "PhotoMonitor.c" } -void photo_monitor_update_revert_to_master (PhotoMonitor* self, LibraryPhoto* photo) { - LibraryPhoto* _tmp0_; +void +photo_monitor_update_revert_to_master (PhotoMonitor* self, + LibraryPhoto* photo) +{ + PhotoUpdates* _tmp0_; PhotoUpdates* _tmp1_; - PhotoUpdates* _tmp2_; #line 909 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 909 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_LIBRARY_PHOTO (photo)); #line 910 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = photo; -#line 910 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = photo_monitor_fetch_photo_updates (self, _tmp0_); + _tmp0_ = photo_monitor_fetch_photo_updates (self, photo); #line 910 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 910 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_revert_to_master (_tmp2_, TRUE); + photo_updates_set_revert_to_master (_tmp1_, TRUE); #line 910 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_unref0 (_tmp2_); -#line 6045 "PhotoMonitor.c" + _monitorable_updates_unref0 (_tmp1_); +#line 6055 "PhotoMonitor.c" } -static gpointer _monitorable_updates_ref0 (gpointer self) { +static gpointer +_monitorable_updates_ref0 (gpointer self) +{ #line 930 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self ? monitorable_updates_ref (self) : NULL; -#line 6052 "PhotoMonitor.c" +#line 6064 "PhotoMonitor.c" } -static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error) { +static void +photo_monitor_real_process_updates (MediaMonitor* base, + GeeCollection* all_updates, + TransactionController* controller, + gint* op_count, + GError** error) +{ PhotoMonitor * self; - GeeCollection* _tmp0_; - TransactionController* _tmp1_; GeeMap* set_editable_file = NULL; GeeMap* set_editable_file_info = NULL; GeeMap* set_raw_developer_files = NULL; @@ -6066,12 +6082,12 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio GeeArrayList* reimport_editable = NULL; GeeArrayList* reimport_raw_developments = NULL; gint reimport_job_count = 0; + GeeMap* _tmp82_; GeeMap* _tmp90_; - GeeMap* _tmp98_; - GeeArrayList* _tmp106_; - GeeArrayList* _tmp124_; - GeeArrayList* _tmp151_; - GeeArrayList* _tmp178_; + GeeArrayList* _tmp98_; + GeeArrayList* _tmp116_; + GeeArrayList* _tmp142_; + GeeArrayList* _tmp168_; GError * _inner_error_ = NULL; #line 913 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_MONITOR, PhotoMonitor); @@ -6080,18 +6096,14 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio #line 913 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller)); #line 915 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = all_updates; -#line 915 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = controller; -#line 915 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - MEDIA_MONITOR_CLASS (photo_monitor_parent_class)->process_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), _tmp0_, _tmp1_, op_count, &_inner_error_); + MEDIA_MONITOR_CLASS (photo_monitor_parent_class)->process_updates (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), all_updates, controller, op_count, &_inner_error_); #line 915 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 915 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_propagate_error (error, _inner_error_); #line 915 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 6093 "PhotoMonitor.c" +#line 6105 "PhotoMonitor.c" } #line 917 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" set_editable_file = NULL; @@ -6109,70 +6121,58 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio reimport_raw_developments = NULL; #line 924 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" reimport_job_count = 0; -#line 6111 "PhotoMonitor.c" +#line 6123 "PhotoMonitor.c" { GeeIterator* _monitorable_updates_it = NULL; - GeeCollection* _tmp2_; - GeeIterator* _tmp3_; + GeeIterator* _tmp0_; #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = all_updates; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (all_updates, GEE_TYPE_ITERABLE, GeeIterable)); #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _monitorable_updates_it = _tmp3_; + _monitorable_updates_it = _tmp0_; #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 6124 "PhotoMonitor.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 6133 "PhotoMonitor.c" + GeeIterator* _tmp1_; MonitorableUpdates* monitorable_updates = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - gint _tmp8_; + GeeIterator* _tmp2_; + gpointer _tmp3_; PhotoUpdates* updates = NULL; - MonitorableUpdates* _tmp9_; - PhotoUpdates* _tmp10_; - PhotoUpdates* _tmp11_; - PhotoUpdates* _tmp12_; - GFile* _tmp13_; - GFile* _tmp14_; - gboolean _tmp15_; - PhotoUpdates* _tmp26_; - GFileInfo* _tmp27_; - GFileInfo* _tmp28_; - gboolean _tmp29_; - PhotoUpdates* _tmp40_; - GeeCollection* _tmp41_; - GeeCollection* _tmp42_; - gboolean _tmp43_; - PhotoUpdates* _tmp54_; - gboolean _tmp55_; - gboolean _tmp66_ = FALSE; - PhotoUpdates* _tmp67_; - gboolean _tmp68_; - gboolean _tmp78_ = FALSE; - PhotoUpdates* _tmp79_; - gboolean _tmp80_; -#line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _monitorable_updates_it; + MonitorableUpdates* _tmp4_; + PhotoUpdates* _tmp5_; + PhotoUpdates* _tmp6_; + PhotoUpdates* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + gboolean _tmp10_; + PhotoUpdates* _tmp21_; + GFileInfo* _tmp22_; + GFileInfo* _tmp23_; + gboolean _tmp24_; + PhotoUpdates* _tmp35_; + GeeCollection* _tmp36_; + GeeCollection* _tmp37_; + gboolean _tmp38_; + PhotoUpdates* _tmp49_; + gboolean _tmp60_ = FALSE; + PhotoUpdates* _tmp61_; + gboolean _tmp71_ = FALSE; + PhotoUpdates* _tmp72_; #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_iterator_next (_tmp4_); + _tmp1_ = _monitorable_updates_it; #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp1_)) { #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 6163 "PhotoMonitor.c" +#line 6165 "PhotoMonitor.c" } #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _monitorable_updates_it; + _tmp2_ = _monitorable_updates_it; #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - monitorable_updates = (MonitorableUpdates*) _tmp7_; + monitorable_updates = (MonitorableUpdates*) _tmp3_; #line 927 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = *op_count; -#line 927 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp8_ >= MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE) { + if ((*op_count) >= MEDIA_MONITOR_MAX_OPERATIONS_PER_CYCLE) { #line 928 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (monitorable_updates); #line 928 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -6180,15 +6180,15 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio #line 6179 "PhotoMonitor.c" } #line 930 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = monitorable_updates; + _tmp4_ = monitorable_updates; #line 930 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _monitorable_updates_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_UPDATES) ? ((PhotoUpdates*) _tmp9_) : NULL); + _tmp5_ = _monitorable_updates_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PHOTO_UPDATES) ? ((PhotoUpdates*) _tmp4_) : NULL); #line 930 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - updates = _tmp10_; + updates = _tmp5_; #line 931 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = updates; + _tmp6_ = updates; #line 931 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp11_ == NULL) { + if (_tmp6_ == NULL) { #line 932 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); #line 932 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -6198,425 +6198,419 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio #line 6197 "PhotoMonitor.c" } #line 934 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = updates; + _tmp7_ = updates; #line 934 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = photo_updates_get_editable_file (_tmp12_); + _tmp8_ = photo_updates_get_editable_file (_tmp7_); #line 934 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_; + _tmp9_ = _tmp8_; #line 934 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _tmp14_ != NULL; + _tmp10_ = _tmp9_ != NULL; #line 934 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp9_); #line 934 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp15_) { + if (_tmp10_) { #line 6211 "PhotoMonitor.c" - GeeMap* _tmp16_; - GeeMap* _tmp18_; + GeeMap* _tmp11_; + GeeMap* _tmp13_; + PhotoUpdates* _tmp14_; + LibraryPhoto* _tmp15_; + PhotoUpdates* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; PhotoUpdates* _tmp19_; - LibraryPhoto* _tmp20_; - PhotoUpdates* _tmp21_; - GFile* _tmp22_; - GFile* _tmp23_; - PhotoUpdates* _tmp24_; - gint _tmp25_; + gint _tmp20_; #line 935 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = set_editable_file; + _tmp11_ = set_editable_file; #line 935 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp16_ == NULL) { + if (_tmp11_ == NULL) { #line 6225 "PhotoMonitor.c" - GeeHashMap* _tmp17_; + GeeHashMap* _tmp12_; #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = gee_hash_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, NULL, NULL, NULL); + _tmp12_ = gee_hash_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, NULL, NULL, NULL); #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (set_editable_file); #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - set_editable_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_MAP, GeeMap); + set_editable_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_MAP, GeeMap); #line 6233 "PhotoMonitor.c" } #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = set_editable_file; + _tmp13_ = set_editable_file; #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = updates; + _tmp14_ = updates; #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = _tmp19_->photo; + _tmp15_ = _tmp14_->photo; #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = updates; + _tmp16_ = updates; #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = photo_updates_get_editable_file (_tmp21_); + _tmp17_ = photo_updates_get_editable_file (_tmp16_); #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = _tmp22_; + _tmp18_ = _tmp17_; #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_map_set (_tmp18_, _tmp20_, _tmp23_); + gee_map_set (_tmp13_, _tmp15_, _tmp18_); #line 938 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp18_); #line 939 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = updates; + _tmp19_ = updates; #line 939 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_file (_tmp24_, NULL); + photo_updates_set_editable_file (_tmp19_, NULL); #line 940 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = *op_count; + _tmp20_ = *op_count; #line 940 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *op_count = _tmp25_ + 1; + *op_count = _tmp20_ + 1; #line 6259 "PhotoMonitor.c" } #line 943 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = updates; + _tmp21_ = updates; #line 943 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = photo_updates_get_editable_file_info (_tmp26_); + _tmp22_ = photo_updates_get_editable_file_info (_tmp21_); #line 943 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = _tmp27_; + _tmp23_ = _tmp22_; #line 943 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = _tmp28_ != NULL; + _tmp24_ = _tmp23_ != NULL; #line 943 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp28_); + _g_object_unref0 (_tmp23_); #line 943 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp29_) { + if (_tmp24_) { #line 6273 "PhotoMonitor.c" - GeeMap* _tmp30_; - GeeMap* _tmp32_; + GeeMap* _tmp25_; + GeeMap* _tmp27_; + PhotoUpdates* _tmp28_; + LibraryPhoto* _tmp29_; + PhotoUpdates* _tmp30_; + GFileInfo* _tmp31_; + GFileInfo* _tmp32_; PhotoUpdates* _tmp33_; - LibraryPhoto* _tmp34_; - PhotoUpdates* _tmp35_; - GFileInfo* _tmp36_; - GFileInfo* _tmp37_; - PhotoUpdates* _tmp38_; - gint _tmp39_; + gint _tmp34_; #line 944 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = set_editable_file_info; + _tmp25_ = set_editable_file_info; #line 944 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp30_ == NULL) { + if (_tmp25_ == NULL) { #line 6287 "PhotoMonitor.c" - GeeHashMap* _tmp31_; + GeeHashMap* _tmp26_; #line 945 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp26_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 945 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (set_editable_file_info); #line 945 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - set_editable_file_info = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_MAP, GeeMap); + set_editable_file_info = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_MAP, GeeMap); #line 6295 "PhotoMonitor.c" } #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = set_editable_file_info; + _tmp27_ = set_editable_file_info; #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = updates; + _tmp28_ = updates; #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp34_ = _tmp33_->photo; + _tmp29_ = _tmp28_->photo; #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = updates; + _tmp30_ = updates; #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp36_ = photo_updates_get_editable_file_info (_tmp35_); + _tmp31_ = photo_updates_get_editable_file_info (_tmp30_); #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp37_ = _tmp36_; + _tmp32_ = _tmp31_; #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_map_set (_tmp32_, _tmp34_, _tmp37_); + gee_map_set (_tmp27_, _tmp29_, _tmp32_); #line 947 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp37_); + _g_object_unref0 (_tmp32_); #line 948 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp38_ = updates; + _tmp33_ = updates; #line 948 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_editable_file_info (_tmp38_, NULL); + photo_updates_set_editable_file_info (_tmp33_, NULL); #line 949 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp39_ = *op_count; + _tmp34_ = *op_count; #line 949 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *op_count = _tmp39_ + 1; + *op_count = _tmp34_ + 1; #line 6321 "PhotoMonitor.c" } #line 952 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp40_ = updates; + _tmp35_ = updates; #line 952 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp41_ = photo_updates_get_raw_developer_files (_tmp40_); + _tmp36_ = photo_updates_get_raw_developer_files (_tmp35_); #line 952 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp42_ = _tmp41_; + _tmp37_ = _tmp36_; #line 952 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp43_ = _tmp42_ != NULL; + _tmp38_ = _tmp37_ != NULL; #line 952 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp42_); + _g_object_unref0 (_tmp37_); #line 952 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp43_) { + if (_tmp38_) { #line 6335 "PhotoMonitor.c" - GeeMap* _tmp44_; - GeeMap* _tmp46_; + GeeMap* _tmp39_; + GeeMap* _tmp41_; + PhotoUpdates* _tmp42_; + LibraryPhoto* _tmp43_; + PhotoUpdates* _tmp44_; + GeeCollection* _tmp45_; + GeeCollection* _tmp46_; PhotoUpdates* _tmp47_; - LibraryPhoto* _tmp48_; - PhotoUpdates* _tmp49_; - GeeCollection* _tmp50_; - GeeCollection* _tmp51_; - PhotoUpdates* _tmp52_; - gint _tmp53_; + gint _tmp48_; #line 953 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp44_ = set_raw_developer_files; + _tmp39_ = set_raw_developer_files; #line 953 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp44_ == NULL) { + if (_tmp39_ == NULL) { #line 6349 "PhotoMonitor.c" - GeeHashMap* _tmp45_; + GeeHashMap* _tmp40_; #line 954 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp45_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_COLLECTION, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp40_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_COLLECTION, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 954 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (set_raw_developer_files); #line 954 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - set_raw_developer_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_MAP, GeeMap); + set_raw_developer_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_MAP, GeeMap); #line 6357 "PhotoMonitor.c" } #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp46_ = set_raw_developer_files; + _tmp41_ = set_raw_developer_files; #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp47_ = updates; + _tmp42_ = updates; #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp48_ = _tmp47_->photo; + _tmp43_ = _tmp42_->photo; #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp49_ = updates; + _tmp44_ = updates; #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp50_ = photo_updates_get_raw_developer_files (_tmp49_); + _tmp45_ = photo_updates_get_raw_developer_files (_tmp44_); #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp51_ = _tmp50_; + _tmp46_ = _tmp45_; #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_map_set (_tmp46_, _tmp48_, _tmp51_); + gee_map_set (_tmp41_, _tmp43_, _tmp46_); #line 956 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp51_); + _g_object_unref0 (_tmp46_); #line 957 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp52_ = updates; + _tmp47_ = updates; #line 957 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_clear_raw_developer_files (_tmp52_); + photo_updates_clear_raw_developer_files (_tmp47_); #line 958 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp53_ = *op_count; + _tmp48_ = *op_count; #line 958 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *op_count = _tmp53_ + 1; + *op_count = _tmp48_ + 1; #line 6383 "PhotoMonitor.c" } #line 961 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp54_ = updates; + _tmp49_ = updates; #line 961 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp55_ = photo_updates_is_revert_to_master (_tmp54_); -#line 961 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp55_) { -#line 6391 "PhotoMonitor.c" - GeeArrayList* _tmp56_; - GeeArrayList* _tmp58_; + if (photo_updates_is_revert_to_master (_tmp49_)) { +#line 6389 "PhotoMonitor.c" + GeeArrayList* _tmp50_; + GeeArrayList* _tmp52_; + gint _tmp53_; + gint _tmp54_; gint _tmp59_; - gint _tmp60_; - gint _tmp65_; #line 962 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp56_ = revert_to_master; + _tmp50_ = revert_to_master; #line 962 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp56_ == NULL) { -#line 6401 "PhotoMonitor.c" - GeeArrayList* _tmp57_; + if (_tmp50_ == NULL) { +#line 6399 "PhotoMonitor.c" + GeeArrayList* _tmp51_; #line 963 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp57_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp51_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 963 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (revert_to_master); #line 963 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - revert_to_master = _tmp57_; -#line 6409 "PhotoMonitor.c" + revert_to_master = _tmp51_; +#line 6407 "PhotoMonitor.c" } #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp58_ = revert_to_master; + _tmp52_ = revert_to_master; #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp59_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp53_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp60_ = _tmp59_; + _tmp54_ = _tmp53_; #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp60_ < PHOTO_MONITOR_MAX_REVERTS_PER_CYCLE) { -#line 6419 "PhotoMonitor.c" - GeeArrayList* _tmp61_; - PhotoUpdates* _tmp62_; - LibraryPhoto* _tmp63_; - PhotoUpdates* _tmp64_; + if (_tmp54_ < PHOTO_MONITOR_MAX_REVERTS_PER_CYCLE) { +#line 6417 "PhotoMonitor.c" + GeeArrayList* _tmp55_; + PhotoUpdates* _tmp56_; + LibraryPhoto* _tmp57_; + PhotoUpdates* _tmp58_; #line 966 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp61_ = revert_to_master; + _tmp55_ = revert_to_master; #line 966 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp62_ = updates; + _tmp56_ = updates; #line 966 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp63_ = _tmp62_->photo; + _tmp57_ = _tmp56_->photo; #line 966 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp63_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp57_); #line 967 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp64_ = updates; + _tmp58_ = updates; #line 967 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_revert_to_master (_tmp64_, FALSE); -#line 6436 "PhotoMonitor.c" + photo_updates_set_revert_to_master (_tmp58_, FALSE); +#line 6434 "PhotoMonitor.c" } #line 969 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp65_ = *op_count; + _tmp59_ = *op_count; #line 969 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *op_count = _tmp65_ + 1; -#line 6442 "PhotoMonitor.c" + *op_count = _tmp59_ + 1; +#line 6440 "PhotoMonitor.c" } #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp67_ = updates; -#line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp68_ = photo_updates_is_reimport_master (_tmp67_); + _tmp61_ = updates; #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp68_) { -#line 6450 "PhotoMonitor.c" - gint _tmp69_; + if (photo_updates_is_reimport_master (_tmp61_)) { +#line 6446 "PhotoMonitor.c" + gint _tmp62_; #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp69_ = reimport_job_count; + _tmp62_ = reimport_job_count; #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp66_ = _tmp69_ < PHOTO_MONITOR_MAX_REIMPORT_JOBS_PER_CYCLE; -#line 6456 "PhotoMonitor.c" + _tmp60_ = _tmp62_ < PHOTO_MONITOR_MAX_REIMPORT_JOBS_PER_CYCLE; +#line 6452 "PhotoMonitor.c" } else { #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp66_ = FALSE; -#line 6460 "PhotoMonitor.c" + _tmp60_ = FALSE; +#line 6456 "PhotoMonitor.c" } #line 972 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp66_) { -#line 6464 "PhotoMonitor.c" - GeeArrayList* _tmp70_; - GeeArrayList* _tmp72_; - PhotoUpdates* _tmp73_; - LibraryPhoto* _tmp74_; - PhotoUpdates* _tmp75_; - gint _tmp76_; - gint _tmp77_; + if (_tmp60_) { +#line 6460 "PhotoMonitor.c" + GeeArrayList* _tmp63_; + GeeArrayList* _tmp65_; + PhotoUpdates* _tmp66_; + LibraryPhoto* _tmp67_; + PhotoUpdates* _tmp68_; + gint _tmp69_; + gint _tmp70_; #line 973 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp70_ = reimport_master; + _tmp63_ = reimport_master; #line 973 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp70_ == NULL) { -#line 6476 "PhotoMonitor.c" - GeeArrayList* _tmp71_; + if (_tmp63_ == NULL) { +#line 6472 "PhotoMonitor.c" + GeeArrayList* _tmp64_; #line 974 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp71_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp64_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 974 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (reimport_master); #line 974 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - reimport_master = _tmp71_; -#line 6484 "PhotoMonitor.c" + reimport_master = _tmp64_; +#line 6480 "PhotoMonitor.c" } #line 976 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp72_ = reimport_master; + _tmp65_ = reimport_master; #line 976 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp73_ = updates; + _tmp66_ = updates; #line 976 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp74_ = _tmp73_->photo; + _tmp67_ = _tmp66_->photo; #line 976 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp74_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp67_); #line 977 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp75_ = updates; + _tmp68_ = updates; #line 977 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_reimport_master (_tmp75_, FALSE); + photo_updates_set_reimport_master (_tmp68_, FALSE); #line 978 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp76_ = reimport_job_count; + _tmp69_ = reimport_job_count; #line 978 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - reimport_job_count = _tmp76_ + 1; + reimport_job_count = _tmp69_ + 1; #line 979 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp77_ = *op_count; + _tmp70_ = *op_count; #line 979 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *op_count = _tmp77_ + 1; -#line 6506 "PhotoMonitor.c" + *op_count = _tmp70_ + 1; +#line 6502 "PhotoMonitor.c" } #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp79_ = updates; + _tmp72_ = updates; #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp80_ = photo_updates_is_reimport_editable (_tmp79_); + if (photo_updates_is_reimport_editable (_tmp72_)) { +#line 6508 "PhotoMonitor.c" + gint _tmp73_; #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp80_) { -#line 6514 "PhotoMonitor.c" - gint _tmp81_; + _tmp73_ = reimport_job_count; #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp81_ = reimport_job_count; -#line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp78_ = _tmp81_ < PHOTO_MONITOR_MAX_REIMPORT_JOBS_PER_CYCLE; -#line 6520 "PhotoMonitor.c" + _tmp71_ = _tmp73_ < PHOTO_MONITOR_MAX_REIMPORT_JOBS_PER_CYCLE; +#line 6514 "PhotoMonitor.c" } else { #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp78_ = FALSE; -#line 6524 "PhotoMonitor.c" + _tmp71_ = FALSE; +#line 6518 "PhotoMonitor.c" } #line 982 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp78_) { -#line 6528 "PhotoMonitor.c" - GeeArrayList* _tmp82_; - GeeArrayList* _tmp84_; - PhotoUpdates* _tmp85_; - LibraryPhoto* _tmp86_; - PhotoUpdates* _tmp87_; - gint _tmp88_; - gint _tmp89_; + if (_tmp71_) { +#line 6522 "PhotoMonitor.c" + GeeArrayList* _tmp74_; + GeeArrayList* _tmp76_; + PhotoUpdates* _tmp77_; + LibraryPhoto* _tmp78_; + PhotoUpdates* _tmp79_; + gint _tmp80_; + gint _tmp81_; #line 983 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp82_ = reimport_editable; + _tmp74_ = reimport_editable; #line 983 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp82_ == NULL) { -#line 6540 "PhotoMonitor.c" - GeeArrayList* _tmp83_; + if (_tmp74_ == NULL) { +#line 6534 "PhotoMonitor.c" + GeeArrayList* _tmp75_; #line 984 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp83_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp75_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 984 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (reimport_editable); #line 984 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - reimport_editable = _tmp83_; -#line 6548 "PhotoMonitor.c" + reimport_editable = _tmp75_; +#line 6542 "PhotoMonitor.c" } #line 986 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp84_ = reimport_editable; + _tmp76_ = reimport_editable; #line 986 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp85_ = updates; + _tmp77_ = updates; #line 986 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp86_ = _tmp85_->photo; + _tmp78_ = _tmp77_->photo; #line 986 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp86_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp78_); #line 987 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp87_ = updates; + _tmp79_ = updates; #line 987 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_updates_set_reimport_editable (_tmp87_, FALSE); + photo_updates_set_reimport_editable (_tmp79_, FALSE); #line 988 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp88_ = reimport_job_count; + _tmp80_ = reimport_job_count; #line 988 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - reimport_job_count = _tmp88_ + 1; + reimport_job_count = _tmp80_ + 1; #line 989 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp89_ = *op_count; + _tmp81_ = *op_count; #line 989 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - *op_count = _tmp89_ + 1; -#line 6570 "PhotoMonitor.c" + *op_count = _tmp81_ + 1; +#line 6564 "PhotoMonitor.c" } #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (updates); #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _monitorable_updates_unref0 (monitorable_updates); -#line 6576 "PhotoMonitor.c" +#line 6570 "PhotoMonitor.c" } #line 926 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_monitorable_updates_it); -#line 6580 "PhotoMonitor.c" +#line 6574 "PhotoMonitor.c" } #line 993 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp90_ = set_editable_file; + _tmp82_ = set_editable_file; #line 993 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp90_ != NULL) { -#line 6586 "PhotoMonitor.c" - GeeMap* _tmp91_; - gint _tmp92_; - gint _tmp93_; - gchar* _tmp94_; - gchar* _tmp95_; + if (_tmp82_ != NULL) { +#line 6580 "PhotoMonitor.c" + GeeMap* _tmp83_; + gint _tmp84_; + gint _tmp85_; + gchar* _tmp86_; + gchar* _tmp87_; #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp91_ = set_editable_file; + _tmp83_ = set_editable_file; #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp92_ = gee_map_get_size (_tmp91_); + _tmp84_ = gee_map_get_size (_tmp83_); #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp93_ = _tmp92_; + _tmp85_ = _tmp84_; #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp94_ = g_strdup_printf ("Changing editable file of %d photos", _tmp93_); + _tmp86_ = g_strdup_printf ("Changing editable file of %d photos", _tmp85_); #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp95_ = _tmp94_; + _tmp87_ = _tmp86_; #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp95_); + media_monitor_mdbg (_tmp87_); #line 994 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp95_); -#line 6606 "PhotoMonitor.c" + _g_free0 (_tmp87_); +#line 6600 "PhotoMonitor.c" { - GeeMap* _tmp96_; + GeeMap* _tmp88_; #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp96_ = set_editable_file; + _tmp88_ = set_editable_file; #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_set_many_editable_file (_tmp96_, &_inner_error_); + photo_set_many_editable_file (_tmp88_, &_inner_error_); #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6617 "PhotoMonitor.c" - goto __catch586_database_error; +#line 6611 "PhotoMonitor.c" + goto __catch595_database_error; } #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (reimport_raw_developments); @@ -6638,27 +6632,27 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio g_clear_error (&_inner_error_); #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 6640 "PhotoMonitor.c" +#line 6634 "PhotoMonitor.c" } } - goto __finally586; - __catch586_database_error: + goto __finally595; + __catch595_database_error: { GError* err = NULL; - GError* _tmp97_; + GError* _tmp89_; #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" err = _inner_error_; #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _inner_error_ = NULL; #line 999 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp97_ = err; + _tmp89_ = err; #line 999 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - app_window_database_error (_tmp97_); + app_window_database_error (_tmp89_); #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 6658 "PhotoMonitor.c" +#line 6652 "PhotoMonitor.c" } - __finally586: + __finally595: #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -6679,46 +6673,46 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio _g_object_unref0 (set_editable_file); #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 6681 "PhotoMonitor.c" +#line 6675 "PhotoMonitor.c" } } #line 1003 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp98_ = set_editable_file_info; + _tmp90_ = set_editable_file_info; #line 1003 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp98_ != NULL) { -#line 6688 "PhotoMonitor.c" - GeeMap* _tmp99_; - gint _tmp100_; - gint _tmp101_; - gchar* _tmp102_; - gchar* _tmp103_; + if (_tmp90_ != NULL) { +#line 6682 "PhotoMonitor.c" + GeeMap* _tmp91_; + gint _tmp92_; + gint _tmp93_; + gchar* _tmp94_; + gchar* _tmp95_; #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp99_ = set_editable_file_info; + _tmp91_ = set_editable_file_info; #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp100_ = gee_map_get_size (_tmp99_); + _tmp92_ = gee_map_get_size (_tmp91_); #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp101_ = _tmp100_; + _tmp93_ = _tmp92_; #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp102_ = g_strdup_printf ("Updating %d editable files timestamps", _tmp101_); + _tmp94_ = g_strdup_printf ("Updating %d editable files timestamps", _tmp93_); #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp103_ = _tmp102_; + _tmp95_ = _tmp94_; #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp103_); + media_monitor_mdbg (_tmp95_); #line 1004 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp103_); -#line 6708 "PhotoMonitor.c" + _g_free0 (_tmp95_); +#line 6702 "PhotoMonitor.c" { - GeeMap* _tmp104_; + GeeMap* _tmp96_; #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp104_ = set_editable_file_info; + _tmp96_ = set_editable_file_info; #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_update_many_editable_timestamps (_tmp104_, &_inner_error_); + photo_update_many_editable_timestamps (_tmp96_, &_inner_error_); #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6719 "PhotoMonitor.c" - goto __catch587_database_error; +#line 6713 "PhotoMonitor.c" + goto __catch596_database_error; } #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (reimport_raw_developments); @@ -6740,27 +6734,27 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio g_clear_error (&_inner_error_); #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 6742 "PhotoMonitor.c" +#line 6736 "PhotoMonitor.c" } } - goto __finally587; - __catch587_database_error: + goto __finally596; + __catch596_database_error: { GError* err = NULL; - GError* _tmp105_; + GError* _tmp97_; #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" err = _inner_error_; #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _inner_error_ = NULL; #line 1009 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp105_ = err; + _tmp97_ = err; #line 1009 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - app_window_database_error (_tmp105_); + app_window_database_error (_tmp97_); #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 6760 "PhotoMonitor.c" +#line 6754 "PhotoMonitor.c" } - __finally587: + __finally596: #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -6781,499 +6775,490 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio _g_object_unref0 (set_editable_file); #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 6783 "PhotoMonitor.c" +#line 6777 "PhotoMonitor.c" } } #line 1013 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp106_ = revert_to_master; + _tmp98_ = revert_to_master; #line 1013 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp106_ != NULL) { -#line 6790 "PhotoMonitor.c" - GeeArrayList* _tmp107_; - gint _tmp108_; - gint _tmp109_; - gchar* _tmp110_; - gchar* _tmp111_; + if (_tmp98_ != NULL) { +#line 6784 "PhotoMonitor.c" + GeeArrayList* _tmp99_; + gint _tmp100_; + gint _tmp101_; + gchar* _tmp102_; + gchar* _tmp103_; #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp107_ = revert_to_master; + _tmp99_ = revert_to_master; #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp100_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp109_ = _tmp108_; + _tmp101_ = _tmp100_; #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp110_ = g_strdup_printf ("Reverting %d photos to master", _tmp109_); + _tmp102_ = g_strdup_printf ("Reverting %d photos to master", _tmp101_); #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp111_ = _tmp110_; + _tmp103_ = _tmp102_; #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp111_); + media_monitor_mdbg (_tmp103_); #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp111_); -#line 6810 "PhotoMonitor.c" + _g_free0 (_tmp103_); +#line 6804 "PhotoMonitor.c" { GeeArrayList* _photo_list = NULL; - GeeArrayList* _tmp112_; - GeeArrayList* _tmp113_; + GeeArrayList* _tmp104_; + GeeArrayList* _tmp105_; gint _photo_size = 0; - GeeArrayList* _tmp114_; - gint _tmp115_; - gint _tmp116_; + GeeArrayList* _tmp106_; + gint _tmp107_; + gint _tmp108_; gint _photo_index = 0; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp112_ = revert_to_master; + _tmp104_ = revert_to_master; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp113_ = _g_object_ref0 (_tmp112_); + _tmp105_ = _g_object_ref0 (_tmp104_); #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_list = _tmp113_; + _photo_list = _tmp105_; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp114_ = _photo_list; + _tmp106_ = _photo_list; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp115_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp107_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp116_ = _tmp115_; + _tmp108_ = _tmp107_; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_size = _tmp116_; + _photo_size = _tmp108_; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _photo_index = -1; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 6838 "PhotoMonitor.c" - gint _tmp117_; - gint _tmp118_; - gint _tmp119_; +#line 6832 "PhotoMonitor.c" + gint _tmp109_; + gint _tmp110_; + gint _tmp111_; LibraryPhoto* photo = NULL; - GeeArrayList* _tmp120_; - gint _tmp121_; - gpointer _tmp122_; - LibraryPhoto* _tmp123_; + GeeArrayList* _tmp112_; + gint _tmp113_; + gpointer _tmp114_; + LibraryPhoto* _tmp115_; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp117_ = _photo_index; + _tmp109_ = _photo_index; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_index = _tmp117_ + 1; + _photo_index = _tmp109_ + 1; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp118_ = _photo_index; + _tmp110_ = _photo_index; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp119_ = _photo_size; + _tmp111_ = _photo_size; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!(_tmp118_ < _tmp119_)) { + if (!(_tmp110_ < _tmp111_)) { #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 6859 "PhotoMonitor.c" +#line 6853 "PhotoMonitor.c" } #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp120_ = _photo_list; + _tmp112_ = _photo_list; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp121_ = _photo_index; + _tmp113_ = _photo_index; #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp122_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp121_); + _tmp114_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp113_); #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = (LibraryPhoto*) _tmp122_; + photo = (LibraryPhoto*) _tmp114_; #line 1017 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp123_ = photo; + _tmp115_ = photo; #line 1017 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, TYPE_PHOTO, Photo), TRUE); + photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, TYPE_PHOTO, Photo), TRUE); #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); -#line 6875 "PhotoMonitor.c" +#line 6869 "PhotoMonitor.c" } #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_photo_list); -#line 6879 "PhotoMonitor.c" +#line 6873 "PhotoMonitor.c" } } #line 1024 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp124_ = reimport_master; + _tmp116_ = reimport_master; #line 1024 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp124_ != NULL) { -#line 6886 "PhotoMonitor.c" - GeeArrayList* _tmp125_; - gint _tmp126_; - gint _tmp127_; - gchar* _tmp128_; - gchar* _tmp129_; + if (_tmp116_ != NULL) { +#line 6880 "PhotoMonitor.c" + GeeArrayList* _tmp117_; + gint _tmp118_; + gint _tmp119_; + gchar* _tmp120_; + gchar* _tmp121_; #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp125_ = reimport_master; + _tmp117_ = reimport_master; #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp126_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp118_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp127_ = _tmp126_; + _tmp119_ = _tmp118_; #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp128_ = g_strdup_printf ("Reimporting %d masters", _tmp127_); + _tmp120_ = g_strdup_printf ("Reimporting %d masters", _tmp119_); #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp129_ = _tmp128_; + _tmp121_ = _tmp120_; #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp129_); + media_monitor_mdbg (_tmp121_); #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp129_); -#line 6906 "PhotoMonitor.c" + _g_free0 (_tmp121_); +#line 6900 "PhotoMonitor.c" { GeeArrayList* _photo_list = NULL; - GeeArrayList* _tmp130_; - GeeArrayList* _tmp131_; + GeeArrayList* _tmp122_; + GeeArrayList* _tmp123_; gint _photo_size = 0; - GeeArrayList* _tmp132_; - gint _tmp133_; - gint _tmp134_; + GeeArrayList* _tmp124_; + gint _tmp125_; + gint _tmp126_; gint _photo_index = 0; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp130_ = reimport_master; + _tmp122_ = reimport_master; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp131_ = _g_object_ref0 (_tmp130_); + _tmp123_ = _g_object_ref0 (_tmp122_); #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_list = _tmp131_; + _photo_list = _tmp123_; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp132_ = _photo_list; + _tmp124_ = _photo_list; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp133_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp125_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp134_ = _tmp133_; + _tmp126_ = _tmp125_; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_size = _tmp134_; + _photo_size = _tmp126_; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _photo_index = -1; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 6934 "PhotoMonitor.c" - gint _tmp135_; - gint _tmp136_; - gint _tmp137_; +#line 6928 "PhotoMonitor.c" + gint _tmp127_; + gint _tmp128_; + gint _tmp129_; LibraryPhoto* photo = NULL; - GeeArrayList* _tmp138_; - gint _tmp139_; - gpointer _tmp140_; - GeeHashMap* _tmp141_; - LibraryPhoto* _tmp142_; - gboolean _tmp143_; + GeeArrayList* _tmp130_; + gint _tmp131_; + gpointer _tmp132_; + GeeHashMap* _tmp133_; + LibraryPhoto* _tmp134_; PhotoMonitorReimportMasterJob* job = NULL; - LibraryPhoto* _tmp144_; - PhotoMonitorReimportMasterJob* _tmp145_; - GeeHashMap* _tmp146_; - LibraryPhoto* _tmp147_; - PhotoMonitorReimportMasterJob* _tmp148_; - Workers* _tmp149_; - PhotoMonitorReimportMasterJob* _tmp150_; + LibraryPhoto* _tmp135_; + PhotoMonitorReimportMasterJob* _tmp136_; + GeeHashMap* _tmp137_; + LibraryPhoto* _tmp138_; + PhotoMonitorReimportMasterJob* _tmp139_; + Workers* _tmp140_; + PhotoMonitorReimportMasterJob* _tmp141_; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp135_ = _photo_index; + _tmp127_ = _photo_index; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_index = _tmp135_ + 1; + _photo_index = _tmp127_ + 1; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp136_ = _photo_index; + _tmp128_ = _photo_index; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp137_ = _photo_size; + _tmp129_ = _photo_size; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!(_tmp136_ < _tmp137_)) { + if (!(_tmp128_ < _tmp129_)) { #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 6965 "PhotoMonitor.c" +#line 6958 "PhotoMonitor.c" } #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp138_ = _photo_list; + _tmp130_ = _photo_list; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp139_ = _photo_index; + _tmp131_ = _photo_index; #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp140_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp139_); + _tmp132_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp131_); #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = (LibraryPhoto*) _tmp140_; + photo = (LibraryPhoto*) _tmp132_; #line 1028 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp141_ = self->priv->master_reimport_pending; + _tmp133_ = self->priv->master_reimport_pending; #line 1028 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp142_ = photo; + _tmp134_ = photo; #line 1028 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp143_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp142_); -#line 1028 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (!_tmp143_, "!master_reimport_pending.has_key(photo)"); + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp134_), "!master_reimport_pending.has_key(photo)"); #line 1030 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp144_ = photo; + _tmp135_ = photo; #line 1030 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp145_ = photo_monitor_reimport_master_job_new (self, _tmp144_); + _tmp136_ = photo_monitor_reimport_master_job_new (self, _tmp135_); #line 1030 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = _tmp145_; + job = _tmp136_; #line 1031 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp146_ = self->priv->master_reimport_pending; + _tmp137_ = self->priv->master_reimport_pending; #line 1031 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp147_ = photo; + _tmp138_ = photo; #line 1031 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp148_ = job; + _tmp139_ = job; #line 1031 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp146_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp147_, _tmp148_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp138_, _tmp139_); #line 1032 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp149_ = self->priv->workers; + _tmp140_ = self->priv->workers; #line 1032 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp150_ = job; + _tmp141_ = job; #line 1032 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - workers_enqueue (_tmp149_, G_TYPE_CHECK_INSTANCE_CAST (_tmp150_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp140_, G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); -#line 7007 "PhotoMonitor.c" +#line 6998 "PhotoMonitor.c" } #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_photo_list); -#line 7011 "PhotoMonitor.c" +#line 7002 "PhotoMonitor.c" } } #line 1036 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp151_ = reimport_editable; + _tmp142_ = reimport_editable; #line 1036 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp151_ != NULL) { -#line 7018 "PhotoMonitor.c" - GeeArrayList* _tmp152_; - gint _tmp153_; - gint _tmp154_; - gchar* _tmp155_; - gchar* _tmp156_; + if (_tmp142_ != NULL) { +#line 7009 "PhotoMonitor.c" + GeeArrayList* _tmp143_; + gint _tmp144_; + gint _tmp145_; + gchar* _tmp146_; + gchar* _tmp147_; #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp152_ = reimport_editable; + _tmp143_ = reimport_editable; #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp153_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp144_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp154_ = _tmp153_; + _tmp145_ = _tmp144_; #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp155_ = g_strdup_printf ("Reimporting %d editables", _tmp154_); + _tmp146_ = g_strdup_printf ("Reimporting %d editables", _tmp145_); #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp156_ = _tmp155_; + _tmp147_ = _tmp146_; #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp156_); + media_monitor_mdbg (_tmp147_); #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp156_); -#line 7038 "PhotoMonitor.c" + _g_free0 (_tmp147_); +#line 7029 "PhotoMonitor.c" { GeeArrayList* _photo_list = NULL; - GeeArrayList* _tmp157_; - GeeArrayList* _tmp158_; + GeeArrayList* _tmp148_; + GeeArrayList* _tmp149_; gint _photo_size = 0; - GeeArrayList* _tmp159_; - gint _tmp160_; - gint _tmp161_; + GeeArrayList* _tmp150_; + gint _tmp151_; + gint _tmp152_; gint _photo_index = 0; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp157_ = reimport_editable; + _tmp148_ = reimport_editable; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp158_ = _g_object_ref0 (_tmp157_); + _tmp149_ = _g_object_ref0 (_tmp148_); #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_list = _tmp158_; + _photo_list = _tmp149_; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp159_ = _photo_list; + _tmp150_ = _photo_list; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp160_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp159_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp151_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp150_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp161_ = _tmp160_; + _tmp152_ = _tmp151_; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_size = _tmp161_; + _photo_size = _tmp152_; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _photo_index = -1; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 7066 "PhotoMonitor.c" - gint _tmp162_; - gint _tmp163_; - gint _tmp164_; +#line 7057 "PhotoMonitor.c" + gint _tmp153_; + gint _tmp154_; + gint _tmp155_; LibraryPhoto* photo = NULL; - GeeArrayList* _tmp165_; - gint _tmp166_; - gpointer _tmp167_; - GeeHashMap* _tmp168_; - LibraryPhoto* _tmp169_; - gboolean _tmp170_; + GeeArrayList* _tmp156_; + gint _tmp157_; + gpointer _tmp158_; + GeeHashMap* _tmp159_; + LibraryPhoto* _tmp160_; PhotoMonitorReimportEditableJob* job = NULL; - LibraryPhoto* _tmp171_; - PhotoMonitorReimportEditableJob* _tmp172_; - GeeHashMap* _tmp173_; - LibraryPhoto* _tmp174_; - PhotoMonitorReimportEditableJob* _tmp175_; - Workers* _tmp176_; - PhotoMonitorReimportEditableJob* _tmp177_; + LibraryPhoto* _tmp161_; + PhotoMonitorReimportEditableJob* _tmp162_; + GeeHashMap* _tmp163_; + LibraryPhoto* _tmp164_; + PhotoMonitorReimportEditableJob* _tmp165_; + Workers* _tmp166_; + PhotoMonitorReimportEditableJob* _tmp167_; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp162_ = _photo_index; + _tmp153_ = _photo_index; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_index = _tmp162_ + 1; + _photo_index = _tmp153_ + 1; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp163_ = _photo_index; + _tmp154_ = _photo_index; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp164_ = _photo_size; + _tmp155_ = _photo_size; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!(_tmp163_ < _tmp164_)) { + if (!(_tmp154_ < _tmp155_)) { #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 7097 "PhotoMonitor.c" +#line 7087 "PhotoMonitor.c" } #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp165_ = _photo_list; + _tmp156_ = _photo_list; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp166_ = _photo_index; + _tmp157_ = _photo_index; #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp167_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp165_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp166_); + _tmp158_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp156_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp157_); #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = (LibraryPhoto*) _tmp167_; -#line 1040 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp168_ = self->priv->editable_reimport_pending; + photo = (LibraryPhoto*) _tmp158_; #line 1040 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp169_ = photo; + _tmp159_ = self->priv->editable_reimport_pending; #line 1040 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp170_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp168_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp169_); + _tmp160_ = photo; #line 1040 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (!_tmp170_, "!editable_reimport_pending.has_key(photo)"); + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp159_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp160_), "!editable_reimport_pending.has_key(photo)"); #line 1042 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp171_ = photo; + _tmp161_ = photo; #line 1042 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp172_ = photo_monitor_reimport_editable_job_new (self, _tmp171_); + _tmp162_ = photo_monitor_reimport_editable_job_new (self, _tmp161_); #line 1042 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = _tmp172_; + job = _tmp162_; #line 1043 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp173_ = self->priv->editable_reimport_pending; + _tmp163_ = self->priv->editable_reimport_pending; #line 1043 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp174_ = photo; + _tmp164_ = photo; #line 1043 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp175_ = job; + _tmp165_ = job; #line 1043 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp173_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp174_, _tmp175_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp163_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp164_, _tmp165_); #line 1044 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp176_ = self->priv->workers; + _tmp166_ = self->priv->workers; #line 1044 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp177_ = job; + _tmp167_ = job; #line 1044 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - workers_enqueue (_tmp176_, G_TYPE_CHECK_INSTANCE_CAST (_tmp177_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp166_, G_TYPE_CHECK_INSTANCE_CAST (_tmp167_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); -#line 7139 "PhotoMonitor.c" +#line 7127 "PhotoMonitor.c" } #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_photo_list); -#line 7143 "PhotoMonitor.c" +#line 7131 "PhotoMonitor.c" } } #line 1048 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp178_ = reimport_raw_developments; + _tmp168_ = reimport_raw_developments; #line 1048 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp178_ != NULL) { -#line 7150 "PhotoMonitor.c" - GeeArrayList* _tmp179_; - gint _tmp180_; - gint _tmp181_; - gchar* _tmp182_; - gchar* _tmp183_; + if (_tmp168_ != NULL) { +#line 7138 "PhotoMonitor.c" + GeeArrayList* _tmp169_; + gint _tmp170_; + gint _tmp171_; + gchar* _tmp172_; + gchar* _tmp173_; #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp179_ = reimport_raw_developments; + _tmp169_ = reimport_raw_developments; #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp180_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp179_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp170_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp169_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp181_ = _tmp180_; + _tmp171_ = _tmp170_; #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp182_ = g_strdup_printf ("Reimporting %d raw developments", _tmp181_); + _tmp172_ = g_strdup_printf ("Reimporting %d raw developments", _tmp171_); #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp183_ = _tmp182_; + _tmp173_ = _tmp172_; #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp183_); + media_monitor_mdbg (_tmp173_); #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp183_); -#line 7170 "PhotoMonitor.c" + _g_free0 (_tmp173_); +#line 7158 "PhotoMonitor.c" { GeeArrayList* _photo_list = NULL; - GeeArrayList* _tmp184_; - GeeArrayList* _tmp185_; + GeeArrayList* _tmp174_; + GeeArrayList* _tmp175_; gint _photo_size = 0; - GeeArrayList* _tmp186_; - gint _tmp187_; - gint _tmp188_; + GeeArrayList* _tmp176_; + gint _tmp177_; + gint _tmp178_; gint _photo_index = 0; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp184_ = reimport_raw_developments; + _tmp174_ = reimport_raw_developments; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp185_ = _g_object_ref0 (_tmp184_); + _tmp175_ = _g_object_ref0 (_tmp174_); #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_list = _tmp185_; + _photo_list = _tmp175_; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp186_ = _photo_list; + _tmp176_ = _photo_list; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp187_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp186_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp177_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp176_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp188_ = _tmp187_; + _tmp178_ = _tmp177_; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_size = _tmp188_; + _photo_size = _tmp178_; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _photo_index = -1; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" while (TRUE) { -#line 7198 "PhotoMonitor.c" - gint _tmp189_; - gint _tmp190_; - gint _tmp191_; +#line 7186 "PhotoMonitor.c" + gint _tmp179_; + gint _tmp180_; + gint _tmp181_; LibraryPhoto* photo = NULL; - GeeArrayList* _tmp192_; - gint _tmp193_; - gpointer _tmp194_; - GeeHashMap* _tmp195_; - LibraryPhoto* _tmp196_; - gboolean _tmp197_; + GeeArrayList* _tmp182_; + gint _tmp183_; + gpointer _tmp184_; + GeeHashMap* _tmp185_; + LibraryPhoto* _tmp186_; PhotoMonitorReimportRawDevelopmentJob* job = NULL; - LibraryPhoto* _tmp198_; - PhotoMonitorReimportRawDevelopmentJob* _tmp199_; - GeeHashMap* _tmp200_; - LibraryPhoto* _tmp201_; - PhotoMonitorReimportRawDevelopmentJob* _tmp202_; - Workers* _tmp203_; - PhotoMonitorReimportRawDevelopmentJob* _tmp204_; + LibraryPhoto* _tmp187_; + PhotoMonitorReimportRawDevelopmentJob* _tmp188_; + GeeHashMap* _tmp189_; + LibraryPhoto* _tmp190_; + PhotoMonitorReimportRawDevelopmentJob* _tmp191_; + Workers* _tmp192_; + PhotoMonitorReimportRawDevelopmentJob* _tmp193_; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp189_ = _photo_index; + _tmp179_ = _photo_index; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _photo_index = _tmp189_ + 1; + _photo_index = _tmp179_ + 1; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp190_ = _photo_index; + _tmp180_ = _photo_index; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp191_ = _photo_size; + _tmp181_ = _photo_size; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!(_tmp190_ < _tmp191_)) { + if (!(_tmp180_ < _tmp181_)) { #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" break; -#line 7229 "PhotoMonitor.c" +#line 7216 "PhotoMonitor.c" } #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp192_ = _photo_list; + _tmp182_ = _photo_list; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp193_ = _photo_index; + _tmp183_ = _photo_index; #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp194_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp192_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp193_); + _tmp184_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp182_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp183_); #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo = (LibraryPhoto*) _tmp194_; + photo = (LibraryPhoto*) _tmp184_; #line 1052 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp195_ = self->priv->raw_developments_reimport_pending; + _tmp185_ = self->priv->raw_developments_reimport_pending; #line 1052 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp196_ = photo; + _tmp186_ = photo; #line 1052 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp197_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp195_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp196_); -#line 1052 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (!_tmp197_, "!raw_developments_reimport_pending.has_key(photo)"); + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp185_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp186_), "!raw_developments_reimport_pending.has_key(photo)"); #line 1054 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp198_ = photo; + _tmp187_ = photo; #line 1054 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp199_ = photo_monitor_reimport_raw_development_job_new (self, _tmp198_); + _tmp188_ = photo_monitor_reimport_raw_development_job_new (self, _tmp187_); #line 1054 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = _tmp199_; + job = _tmp188_; #line 1055 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp200_ = self->priv->raw_developments_reimport_pending; + _tmp189_ = self->priv->raw_developments_reimport_pending; #line 1055 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp201_ = photo; + _tmp190_ = photo; #line 1055 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp202_ = job; + _tmp191_ = job; #line 1055 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp200_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp201_, _tmp202_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp189_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp190_, _tmp191_); #line 1056 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp203_ = self->priv->workers; + _tmp192_ = self->priv->workers; #line 1056 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp204_ = job; + _tmp193_ = job; #line 1056 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - workers_enqueue (_tmp203_, G_TYPE_CHECK_INSTANCE_CAST (_tmp204_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp192_, G_TYPE_CHECK_INSTANCE_CAST (_tmp193_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (photo); -#line 7271 "PhotoMonitor.c" +#line 7256 "PhotoMonitor.c" } #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (_photo_list); -#line 7275 "PhotoMonitor.c" +#line 7260 "PhotoMonitor.c" } } #line 913 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7290,154 +7275,155 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio _g_object_unref0 (set_editable_file_info); #line 913 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (set_editable_file); -#line 7292 "PhotoMonitor.c" +#line 7277 "PhotoMonitor.c" } -static gpointer _background_job_ref0 (gpointer self) { +static gpointer +_background_job_ref0 (gpointer self) +{ #line 1062 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self ? background_job_ref (self) : NULL; -#line 7299 "PhotoMonitor.c" +#line 7286 "PhotoMonitor.c" } -static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJob* j) { +static void +photo_monitor_on_master_reimported (PhotoMonitor* self, + BackgroundJob* j) +{ PhotoMonitorReimportMasterJob* job = NULL; - BackgroundJob* _tmp0_; - PhotoMonitorReimportMasterJob* _tmp1_; + PhotoMonitorReimportMasterJob* _tmp0_; gboolean removed = FALSE; - GeeHashMap* _tmp2_; - PhotoMonitorReimportMasterJob* _tmp3_; - LibraryPhoto* _tmp4_; + GeeHashMap* _tmp1_; + PhotoMonitorReimportMasterJob* _tmp2_; + LibraryPhoto* _tmp3_; + gboolean _tmp4_; gboolean _tmp5_; - gboolean _tmp6_; - PhotoMonitorReimportMasterJob* _tmp7_; - GError* _tmp8_; - PhotoMonitorReimportMasterJob* _tmp18_; - gboolean _tmp19_; - PhotoMonitorReimportMasterJob* _tmp27_; - LibraryPhoto* _tmp28_; - gboolean _tmp29_; - PhotoMonitorReimportMasterJob* _tmp32_; - LibraryPhoto* _tmp33_; + PhotoMonitorReimportMasterJob* _tmp6_; + GError* _tmp7_; + PhotoMonitorReimportMasterJob* _tmp17_; + gboolean _tmp18_; + PhotoMonitorReimportMasterJob* _tmp26_; + LibraryPhoto* _tmp27_; + PhotoMonitorReimportMasterJob* _tmp30_; + LibraryPhoto* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; gchar* _tmp34_; gchar* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; GError * _inner_error_ = NULL; #line 1061 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 1061 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 1062 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = j; + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, PhotoMonitorReimportMasterJob)); #line 1062 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, PhotoMonitorReimportMasterJob)); -#line 1062 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = _tmp1_; + job = _tmp0_; #line 1065 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->priv->master_reimport_pending; + _tmp1_ = self->priv->master_reimport_pending; #line 1065 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = job; + _tmp2_ = job; #line 1065 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp3_->photo; + _tmp3_ = _tmp2_->photo; #line 1065 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL); + _tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, NULL); #line 1065 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - removed = _tmp5_; + removed = _tmp4_; #line 1066 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = removed; + _tmp5_ = removed; #line 1066 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (_tmp6_, "removed"); + _vala_assert (_tmp5_, "removed"); #line 1068 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = job; + _tmp6_ = job; #line 1068 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = _tmp7_->err; + _tmp7_ = _tmp6_->err; #line 1068 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp8_ != NULL) { -#line 7357 "PhotoMonitor.c" - PhotoMonitorReimportMasterJob* _tmp9_; - LibraryPhoto* _tmp10_; + if (_tmp7_ != NULL) { +#line 7343 "PhotoMonitor.c" + PhotoMonitorReimportMasterJob* _tmp8_; + LibraryPhoto* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - PhotoMonitorReimportMasterJob* _tmp13_; - GError* _tmp14_; - const gchar* _tmp15_; - PhotoMonitorReimportMasterJob* _tmp16_; - LibraryPhoto* _tmp17_; + PhotoMonitorReimportMasterJob* _tmp12_; + GError* _tmp13_; + const gchar* _tmp14_; + PhotoMonitorReimportMasterJob* _tmp15_; + LibraryPhoto* _tmp16_; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = job; + _tmp8_ = job; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _tmp9_->photo; + _tmp9_ = _tmp8_->photo; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = job; + _tmp12_ = job; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_->err; + _tmp13_ = _tmp12_->err; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _tmp14_->message; + _tmp14_ = _tmp13_->message; #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_critical ("PhotoMonitor.vala:1069: Unable to reimport %s due to master file chang" \ -"ing: %s", _tmp12_, _tmp15_); +"ing: %s", _tmp11_, _tmp14_); #line 1069 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 1072 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = job; + _tmp15_ = job; #line 1072 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_->photo; + _tmp16_ = _tmp15_->photo; #line 1072 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MONITORABLE, Monitorable)); #line 1074 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1074 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7395 "PhotoMonitor.c" +#line 7381 "PhotoMonitor.c" } #line 1077 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = job; + _tmp17_ = job; #line 1077 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = _tmp18_->mark_online; + _tmp18_ = _tmp17_->mark_online; #line 1077 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (!_tmp19_) { -#line 7403 "PhotoMonitor.c" - PhotoMonitorReimportMasterJob* _tmp20_; - LibraryPhoto* _tmp21_; + if (!_tmp18_) { +#line 7389 "PhotoMonitor.c" + PhotoMonitorReimportMasterJob* _tmp19_; + LibraryPhoto* _tmp20_; #line 1079 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = job; + _tmp19_ = job; #line 1079 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = _tmp20_->photo; + _tmp20_ = _tmp19_->photo; #line 1079 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MONITORABLE, Monitorable)); + media_monitor_update_offline (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_MONITORABLE, Monitorable)); #line 1081 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1081 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7416 "PhotoMonitor.c" +#line 7402 "PhotoMonitor.c" } { - PhotoMonitorReimportMasterJob* _tmp22_; - LibraryPhoto* _tmp23_; - PhotoMonitorReimportMasterJob* _tmp24_; - PhotoReimportMasterState* _tmp25_; + PhotoMonitorReimportMasterJob* _tmp21_; + LibraryPhoto* _tmp22_; + PhotoMonitorReimportMasterJob* _tmp23_; + PhotoReimportMasterState* _tmp24_; #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = job; + _tmp21_ = job; #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = _tmp22_->photo; + _tmp22_ = _tmp21_->photo; #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = job; + _tmp23_ = job; #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = _tmp24_->reimport_state; + _tmp24_ = _tmp23_->reimport_state; #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo), _tmp25_, &_inner_error_); + photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PHOTO, Photo), _tmp24_, &_inner_error_); #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 7437 "PhotoMonitor.c" - goto __catch588_database_error; +#line 7423 "PhotoMonitor.c" + goto __catch597_database_error; } #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); @@ -7447,27 +7433,27 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo g_clear_error (&_inner_error_); #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7448 "PhotoMonitor.c" +#line 7434 "PhotoMonitor.c" } } - goto __finally588; - __catch588_database_error: + goto __finally597; + __catch597_database_error: { GError* err = NULL; - GError* _tmp26_; + GError* _tmp25_; #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" err = _inner_error_; #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _inner_error_ = NULL; #line 1087 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = err; + _tmp25_ = err; #line 1087 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - app_window_database_error (_tmp26_); + app_window_database_error (_tmp25_); #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 7466 "PhotoMonitor.c" +#line 7452 "PhotoMonitor.c" } - __finally588: + __finally597: #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7478,57 +7464,57 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo g_clear_error (&_inner_error_); #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7479 "PhotoMonitor.c" +#line 7465 "PhotoMonitor.c" } #line 1091 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp27_ = job; + _tmp26_ = job; #line 1091 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp28_ = _tmp27_->photo; + _tmp27_ = _tmp26_->photo; #line 1091 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp29_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1091 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp29_) { -#line 7489 "PhotoMonitor.c" - PhotoMonitorReimportMasterJob* _tmp30_; - LibraryPhoto* _tmp31_; + if (media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_MEDIA_SOURCE, MediaSource))) { +#line 7473 "PhotoMonitor.c" + PhotoMonitorReimportMasterJob* _tmp28_; + LibraryPhoto* _tmp29_; #line 1092 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp30_ = job; + _tmp28_ = job; #line 1092 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp31_ = _tmp30_->photo; + _tmp29_ = _tmp28_->photo; #line 1092 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_update_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_MONITORABLE, Monitorable)); -#line 7498 "PhotoMonitor.c" + media_monitor_update_online (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MONITORABLE, Monitorable)); +#line 7482 "PhotoMonitor.c" } #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp32_ = job; -#line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp33_ = _tmp32_->photo; + _tmp30_ = job; #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp34_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_OBJECT, DataObject)); + _tmp31_ = _tmp30_->photo; #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp35_ = _tmp34_; + _tmp32_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject)); #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp36_ = g_strdup_printf ("Reimported master for %s", _tmp35_); + _tmp33_ = _tmp32_; #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp37_ = _tmp36_; + _tmp34_ = g_strdup_printf ("Reimported master for %s", _tmp33_); #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp37_); + _tmp35_ = _tmp34_; #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp37_); + media_monitor_mdbg (_tmp35_); #line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_free0 (_tmp35_); +#line 1094 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" + _g_free0 (_tmp33_); #line 1061 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); -#line 7520 "PhotoMonitor.c" +#line 7504 "PhotoMonitor.c" } -static void photo_monitor_on_master_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j) { +static void +photo_monitor_on_master_reimport_cancelled (PhotoMonitor* self, + BackgroundJob* j) +{ gboolean removed = FALSE; GeeHashMap* _tmp0_; - BackgroundJob* _tmp1_; - LibraryPhoto* _tmp2_; - gboolean _tmp3_; + LibraryPhoto* _tmp1_; + gboolean _tmp2_; #line 1097 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 1097 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7536,121 +7522,119 @@ static void photo_monitor_on_master_reimport_cancelled (PhotoMonitor* self, Back #line 1098 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = self->priv->master_reimport_pending; #line 1098 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = j; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (j, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, PhotoMonitorReimportMasterJob)->photo; #line 1098 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, PhotoMonitorReimportMasterJob)->photo; + _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); #line 1098 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, NULL); -#line 1098 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - removed = _tmp3_; + removed = _tmp2_; #line 1099 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_assert (removed, "removed"); -#line 7546 "PhotoMonitor.c" +#line 7530 "PhotoMonitor.c" } -static void photo_monitor_on_editable_reimported (PhotoMonitor* self, BackgroundJob* j) { +static void +photo_monitor_on_editable_reimported (PhotoMonitor* self, + BackgroundJob* j) +{ PhotoMonitorReimportEditableJob* job = NULL; - BackgroundJob* _tmp0_; - PhotoMonitorReimportEditableJob* _tmp1_; + PhotoMonitorReimportEditableJob* _tmp0_; gboolean removed = FALSE; - GeeHashMap* _tmp2_; - PhotoMonitorReimportEditableJob* _tmp3_; - LibraryPhoto* _tmp4_; + GeeHashMap* _tmp1_; + PhotoMonitorReimportEditableJob* _tmp2_; + LibraryPhoto* _tmp3_; + gboolean _tmp4_; gboolean _tmp5_; - gboolean _tmp6_; - PhotoMonitorReimportEditableJob* _tmp7_; - GError* _tmp8_; - PhotoMonitorReimportEditableJob* _tmp21_; - LibraryPhoto* _tmp22_; + PhotoMonitorReimportEditableJob* _tmp6_; + GError* _tmp7_; + PhotoMonitorReimportEditableJob* _tmp20_; + LibraryPhoto* _tmp21_; + gchar* _tmp22_; gchar* _tmp23_; gchar* _tmp24_; gchar* _tmp25_; - gchar* _tmp26_; GError * _inner_error_ = NULL; #line 1102 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 1102 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 1103 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = j; -#line 1103 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, PhotoMonitorReimportEditableJob)); + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, PhotoMonitorReimportEditableJob)); #line 1103 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = _tmp1_; + job = _tmp0_; #line 1106 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->priv->editable_reimport_pending; + _tmp1_ = self->priv->editable_reimport_pending; #line 1106 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = job; + _tmp2_ = job; #line 1106 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp3_->photo; + _tmp3_ = _tmp2_->photo; #line 1106 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL); + _tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, NULL); #line 1106 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - removed = _tmp5_; + removed = _tmp4_; #line 1107 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = removed; + _tmp5_ = removed; #line 1107 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (_tmp6_, "removed"); + _vala_assert (_tmp5_, "removed"); #line 1109 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = job; + _tmp6_ = job; #line 1109 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = _tmp7_->err; + _tmp7_ = _tmp6_->err; #line 1109 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp8_ != NULL) { -#line 7599 "PhotoMonitor.c" - PhotoMonitorReimportEditableJob* _tmp9_; - LibraryPhoto* _tmp10_; + if (_tmp7_ != NULL) { +#line 7583 "PhotoMonitor.c" + PhotoMonitorReimportEditableJob* _tmp8_; + LibraryPhoto* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - PhotoMonitorReimportEditableJob* _tmp13_; - GError* _tmp14_; - const gchar* _tmp15_; + PhotoMonitorReimportEditableJob* _tmp12_; + GError* _tmp13_; + const gchar* _tmp14_; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = job; + _tmp8_ = job; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _tmp9_->photo; + _tmp9_ = _tmp8_->photo; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = job; + _tmp12_ = job; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_->err; + _tmp13_ = _tmp12_->err; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _tmp14_->message; + _tmp14_ = _tmp13_->message; #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_critical ("PhotoMonitor.vala:1110: Unable to reimport editable %s: %s", _tmp12_, _tmp15_); + g_critical ("PhotoMonitor.vala:1110: Unable to reimport editable %s: %s", _tmp11_, _tmp14_); #line 1110 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 1112 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1112 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7629 "PhotoMonitor.c" +#line 7613 "PhotoMonitor.c" } { - PhotoMonitorReimportEditableJob* _tmp16_; - LibraryPhoto* _tmp17_; - PhotoMonitorReimportEditableJob* _tmp18_; - PhotoReimportEditableState* _tmp19_; + PhotoMonitorReimportEditableJob* _tmp15_; + LibraryPhoto* _tmp16_; + PhotoMonitorReimportEditableJob* _tmp17_; + PhotoReimportEditableState* _tmp18_; #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = job; + _tmp15_ = job; #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_->photo; + _tmp16_ = _tmp15_->photo; #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = job; + _tmp17_ = job; #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = _tmp18_->state; + _tmp18_ = _tmp17_->state; #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_finish_reimport_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo), _tmp19_, &_inner_error_); + photo_finish_reimport_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo), _tmp18_, &_inner_error_); #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 7650 "PhotoMonitor.c" - goto __catch589_database_error; +#line 7634 "PhotoMonitor.c" + goto __catch598_database_error; } #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); @@ -7660,27 +7644,27 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background g_clear_error (&_inner_error_); #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7661 "PhotoMonitor.c" +#line 7645 "PhotoMonitor.c" } } - goto __finally589; - __catch589_database_error: + goto __finally598; + __catch598_database_error: { GError* err = NULL; - GError* _tmp20_; + GError* _tmp19_; #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" err = _inner_error_; #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _inner_error_ = NULL; #line 1118 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = err; + _tmp19_ = err; #line 1118 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - app_window_database_error (_tmp20_); + app_window_database_error (_tmp19_); #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 7679 "PhotoMonitor.c" +#line 7663 "PhotoMonitor.c" } - __finally589: + __finally598: #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7691,38 +7675,40 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background g_clear_error (&_inner_error_); #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7692 "PhotoMonitor.c" +#line 7676 "PhotoMonitor.c" } #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = job; + _tmp20_ = job; #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = _tmp21_->photo; + _tmp21_ = _tmp20_->photo; #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject)); + _tmp22_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_OBJECT, DataObject)); #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = g_strdup_printf ("Reimported editable for %s", _tmp24_); + _tmp24_ = g_strdup_printf ("Reimported editable for %s", _tmp23_); #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = _tmp25_; + _tmp25_ = _tmp24_; #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp26_); + media_monitor_mdbg (_tmp25_); #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp25_); #line 1121 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp23_); #line 1102 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); -#line 7714 "PhotoMonitor.c" +#line 7698 "PhotoMonitor.c" } -static void photo_monitor_on_editable_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j) { +static void +photo_monitor_on_editable_reimport_cancelled (PhotoMonitor* self, + BackgroundJob* j) +{ gboolean removed = FALSE; GeeHashMap* _tmp0_; - BackgroundJob* _tmp1_; - LibraryPhoto* _tmp2_; - gboolean _tmp3_; + LibraryPhoto* _tmp1_; + gboolean _tmp2_; #line 1124 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 1124 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7730,121 +7716,119 @@ static void photo_monitor_on_editable_reimport_cancelled (PhotoMonitor* self, Ba #line 1125 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = self->priv->editable_reimport_pending; #line 1125 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = j; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (j, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, PhotoMonitorReimportEditableJob)->photo; #line 1125 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, PhotoMonitorReimportEditableJob)->photo; + _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); #line 1125 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, NULL); -#line 1125 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - removed = _tmp3_; + removed = _tmp2_; #line 1126 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_assert (removed, "removed"); -#line 7740 "PhotoMonitor.c" +#line 7724 "PhotoMonitor.c" } -static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, BackgroundJob* j) { +static void +photo_monitor_on_raw_development_reimported (PhotoMonitor* self, + BackgroundJob* j) +{ PhotoMonitorReimportRawDevelopmentJob* job = NULL; - BackgroundJob* _tmp0_; - PhotoMonitorReimportRawDevelopmentJob* _tmp1_; + PhotoMonitorReimportRawDevelopmentJob* _tmp0_; gboolean removed = FALSE; - GeeHashMap* _tmp2_; - PhotoMonitorReimportRawDevelopmentJob* _tmp3_; - LibraryPhoto* _tmp4_; + GeeHashMap* _tmp1_; + PhotoMonitorReimportRawDevelopmentJob* _tmp2_; + LibraryPhoto* _tmp3_; + gboolean _tmp4_; gboolean _tmp5_; - gboolean _tmp6_; - PhotoMonitorReimportRawDevelopmentJob* _tmp7_; - GError* _tmp8_; - PhotoMonitorReimportRawDevelopmentJob* _tmp21_; - LibraryPhoto* _tmp22_; + PhotoMonitorReimportRawDevelopmentJob* _tmp6_; + GError* _tmp7_; + PhotoMonitorReimportRawDevelopmentJob* _tmp20_; + LibraryPhoto* _tmp21_; + gchar* _tmp22_; gchar* _tmp23_; gchar* _tmp24_; gchar* _tmp25_; - gchar* _tmp26_; GError * _inner_error_ = NULL; #line 1129 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 1129 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 1130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = j; + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, PhotoMonitorReimportRawDevelopmentJob)); #line 1130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, PhotoMonitorReimportRawDevelopmentJob)); -#line 1130 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - job = _tmp1_; + job = _tmp0_; #line 1133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = self->priv->raw_developments_reimport_pending; + _tmp1_ = self->priv->raw_developments_reimport_pending; #line 1133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = job; + _tmp2_ = job; #line 1133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = _tmp3_->photo; + _tmp3_ = _tmp2_->photo; #line 1133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL); + _tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, NULL); #line 1133 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - removed = _tmp5_; + removed = _tmp4_; #line 1134 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = removed; + _tmp5_ = removed; #line 1134 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _vala_assert (_tmp6_, "removed"); + _vala_assert (_tmp5_, "removed"); #line 1136 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp7_ = job; + _tmp6_ = job; #line 1136 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp8_ = _tmp7_->err; + _tmp7_ = _tmp6_->err; #line 1136 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - if (_tmp8_ != NULL) { -#line 7793 "PhotoMonitor.c" - PhotoMonitorReimportRawDevelopmentJob* _tmp9_; - LibraryPhoto* _tmp10_; + if (_tmp7_ != NULL) { +#line 7777 "PhotoMonitor.c" + PhotoMonitorReimportRawDevelopmentJob* _tmp8_; + LibraryPhoto* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - PhotoMonitorReimportRawDevelopmentJob* _tmp13_; - GError* _tmp14_; - const gchar* _tmp15_; + PhotoMonitorReimportRawDevelopmentJob* _tmp12_; + GError* _tmp13_; + const gchar* _tmp14_; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp9_ = job; + _tmp8_ = job; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp10_ = _tmp9_->photo; + _tmp9_ = _tmp8_->photo; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp13_ = job; + _tmp12_ = job; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp14_ = _tmp13_->err; + _tmp13_ = _tmp12_->err; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp15_ = _tmp14_->message; + _tmp14_ = _tmp13_->message; #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - g_critical ("PhotoMonitor.vala:1137: Unable to reimport raw development %s: %s", _tmp12_, _tmp15_); + g_critical ("PhotoMonitor.vala:1137: Unable to reimport raw development %s: %s", _tmp11_, _tmp14_); #line 1137 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 1139 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); #line 1139 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7823 "PhotoMonitor.c" +#line 7807 "PhotoMonitor.c" } { - PhotoMonitorReimportRawDevelopmentJob* _tmp16_; - LibraryPhoto* _tmp17_; - PhotoMonitorReimportRawDevelopmentJob* _tmp18_; - PhotoReimportRawDevelopmentState* _tmp19_; + PhotoMonitorReimportRawDevelopmentJob* _tmp15_; + LibraryPhoto* _tmp16_; + PhotoMonitorReimportRawDevelopmentJob* _tmp17_; + PhotoReimportRawDevelopmentState* _tmp18_; #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp16_ = job; + _tmp15_ = job; #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = _tmp16_->photo; + _tmp16_ = _tmp15_->photo; #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp18_ = job; + _tmp17_ = job; #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp19_ = _tmp18_->state; + _tmp18_ = _tmp17_->state; #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - photo_finish_reimport_raw_development (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo), _tmp19_, &_inner_error_); + photo_finish_reimport_raw_development (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo), _tmp18_, &_inner_error_); #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 7844 "PhotoMonitor.c" - goto __catch590_database_error; +#line 7828 "PhotoMonitor.c" + goto __catch599_database_error; } #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); @@ -7854,27 +7838,27 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac g_clear_error (&_inner_error_); #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7855 "PhotoMonitor.c" +#line 7839 "PhotoMonitor.c" } } - goto __finally590; - __catch590_database_error: + goto __finally599; + __catch599_database_error: { GError* err = NULL; - GError* _tmp20_; + GError* _tmp19_; #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" err = _inner_error_; #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _inner_error_ = NULL; #line 1145 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp20_ = err; + _tmp19_ = err; #line 1145 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - app_window_database_error (_tmp20_); + app_window_database_error (_tmp19_); #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 7873 "PhotoMonitor.c" +#line 7857 "PhotoMonitor.c" } - __finally590: + __finally599: #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7885,38 +7869,40 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac g_clear_error (&_inner_error_); #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 7886 "PhotoMonitor.c" +#line 7870 "PhotoMonitor.c" } #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp21_ = job; + _tmp20_ = job; #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp22_ = _tmp21_->photo; + _tmp21_ = _tmp20_->photo; #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp23_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject)); + _tmp22_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_OBJECT, DataObject)); #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp25_ = g_strdup_printf ("Reimported raw development for %s", _tmp24_); + _tmp24_ = g_strdup_printf ("Reimported raw development for %s", _tmp23_); #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp26_ = _tmp25_; + _tmp25_ = _tmp24_; #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - media_monitor_mdbg (_tmp26_); + media_monitor_mdbg (_tmp25_); #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp25_); #line 1148 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp23_); #line 1129 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _background_job_unref0 (job); -#line 7908 "PhotoMonitor.c" +#line 7892 "PhotoMonitor.c" } -static void photo_monitor_on_raw_development_reimport_cancelled (PhotoMonitor* self, BackgroundJob* j) { +static void +photo_monitor_on_raw_development_reimport_cancelled (PhotoMonitor* self, + BackgroundJob* j) +{ gboolean removed = FALSE; GeeHashMap* _tmp0_; - BackgroundJob* _tmp1_; - LibraryPhoto* _tmp2_; - gboolean _tmp3_; + LibraryPhoto* _tmp1_; + gboolean _tmp2_; #line 1151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_if_fail (IS_PHOTO_MONITOR (self)); #line 1151 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -7924,94 +7910,97 @@ static void photo_monitor_on_raw_development_reimport_cancelled (PhotoMonitor* s #line 1152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _tmp0_ = self->priv->raw_developments_reimport_pending; #line 1152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = j; -#line 1152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, PhotoMonitorReimportRawDevelopmentJob)->photo; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (j, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, PhotoMonitorReimportRawDevelopmentJob)->photo; #line 1152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, NULL); + _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); #line 1152 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - removed = _tmp3_; + removed = _tmp2_; #line 1153 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _vala_assert (removed, "removed"); -#line 7934 "PhotoMonitor.c" +#line 7918 "PhotoMonitor.c" } -static void _photo_monitor_on_master_reimported_completion_callback (BackgroundJob* job, gpointer self) { +static void +_photo_monitor_on_master_reimported_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_on_master_reimported ((PhotoMonitor*) self, job); -#line 7941 "PhotoMonitor.c" +#line 7928 "PhotoMonitor.c" } -static void _photo_monitor_on_master_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +static void +_photo_monitor_on_master_reimport_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self) +{ #line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_on_master_reimport_cancelled ((PhotoMonitor*) self, job); -#line 7948 "PhotoMonitor.c" +#line 7938 "PhotoMonitor.c" } -static PhotoMonitorReimportMasterJob* photo_monitor_reimport_master_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo) { +static PhotoMonitorReimportMasterJob* +photo_monitor_reimport_master_job_construct (GType object_type, + PhotoMonitor* owner, + LibraryPhoto* photo) +{ PhotoMonitorReimportMasterJob* self = NULL; - PhotoMonitor* _tmp0_; - PhotoMonitor* _tmp1_; - GCancellable* _tmp2_; - GCancellable* _tmp3_; - PhotoMonitor* _tmp4_; - LibraryPhoto* _tmp5_; - LibraryPhoto* _tmp6_; + GCancellable* _tmp0_; + GCancellable* _tmp1_; + LibraryPhoto* _tmp2_; #line 167 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (owner), NULL); #line 167 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = owner; + _tmp0_ = g_cancellable_new (); #line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = owner; + _tmp1_ = _tmp0_; #line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = g_cancellable_new (); -#line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp2_; + self = (PhotoMonitorReimportMasterJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), _photo_monitor_on_master_reimported_completion_callback, owner, _tmp1_, _photo_monitor_on_master_reimport_cancelled_cancellation_callback, owner, NULL); #line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = owner; -#line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self = (PhotoMonitorReimportMasterJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _photo_monitor_on_master_reimported_completion_callback, _tmp1_, _tmp3_, _photo_monitor_on_master_reimport_cancelled_cancellation_callback, _tmp4_, NULL); -#line 168 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 171 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; -#line 171 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp2_ = _g_object_ref0 (photo); #line 171 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (self->photo); #line 171 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->photo = _tmp6_; + self->photo = _tmp2_; #line 167 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self; -#line 7989 "PhotoMonitor.c" +#line 7971 "PhotoMonitor.c" } -static PhotoMonitorReimportMasterJob* photo_monitor_reimport_master_job_new (PhotoMonitor* owner, LibraryPhoto* photo) { +static PhotoMonitorReimportMasterJob* +photo_monitor_reimport_master_job_new (PhotoMonitor* owner, + LibraryPhoto* photo) +{ #line 167 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return photo_monitor_reimport_master_job_construct (PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, owner, photo); -#line 7996 "PhotoMonitor.c" +#line 7981 "PhotoMonitor.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 178 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self ? g_error_copy (self) : NULL; -#line 8003 "PhotoMonitor.c" +#line 7990 "PhotoMonitor.c" } -static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base) { +static void +photo_monitor_reimport_master_job_real_execute (BackgroundJob* base) +{ PhotoMonitorReimportMasterJob * self; GError * _inner_error_ = NULL; #line 174 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, PhotoMonitorReimportMasterJob); -#line 8012 "PhotoMonitor.c" +#line 8001 "PhotoMonitor.c" { gboolean _tmp0_ = FALSE; LibraryPhoto* _tmp1_; @@ -8029,15 +8018,15 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base) _tmp0_ = _tmp3_; #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8030 "PhotoMonitor.c" - goto __catch591_g_error; +#line 8019 "PhotoMonitor.c" + goto __catch600_g_error; } #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->mark_online = _tmp0_; -#line 8035 "PhotoMonitor.c" +#line 8024 "PhotoMonitor.c" } - goto __finally591; - __catch591_g_error: + goto __finally600; + __catch600_g_error: { GError* err = NULL; GError* _tmp4_; @@ -8056,9 +8045,9 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base) self->err = _tmp5_; #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 8057 "PhotoMonitor.c" +#line 8046 "PhotoMonitor.c" } - __finally591: + __finally600: #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -8067,34 +8056,40 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base) g_clear_error (&_inner_error_); #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 8068 "PhotoMonitor.c" +#line 8057 "PhotoMonitor.c" } } -static void photo_monitor_reimport_master_job_class_init (PhotoMonitorReimportMasterJobClass * klass) { +static void +photo_monitor_reimport_master_job_class_init (PhotoMonitorReimportMasterJobClass * klass) +{ #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_reimport_master_job_parent_class = g_type_class_peek_parent (klass); #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((BackgroundJobClass *) klass)->finalize = photo_monitor_reimport_master_job_finalize; #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) photo_monitor_reimport_master_job_real_execute; -#line 8080 "PhotoMonitor.c" +#line 8071 "PhotoMonitor.c" } -static void photo_monitor_reimport_master_job_instance_init (PhotoMonitorReimportMasterJob * self) { +static void +photo_monitor_reimport_master_job_instance_init (PhotoMonitorReimportMasterJob * self) +{ #line 163 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->reimport_state = NULL; #line 164 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->mark_online = FALSE; #line 165 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->err = NULL; -#line 8091 "PhotoMonitor.c" +#line 8084 "PhotoMonitor.c" } -static void photo_monitor_reimport_master_job_finalize (BackgroundJob * obj) { +static void +photo_monitor_reimport_master_job_finalize (BackgroundJob * obj) +{ PhotoMonitorReimportMasterJob * self; #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, PhotoMonitorReimportMasterJob); @@ -8106,11 +8101,13 @@ static void photo_monitor_reimport_master_job_finalize (BackgroundJob * obj) { _g_error_free0 (self->err); #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" BACKGROUND_JOB_CLASS (photo_monitor_reimport_master_job_parent_class)->finalize (obj); -#line 8107 "PhotoMonitor.c" +#line 8102 "PhotoMonitor.c" } -static GType photo_monitor_reimport_master_job_get_type (void) { +static GType +photo_monitor_reimport_master_job_get_type (void) +{ static volatile gsize photo_monitor_reimport_master_job_type_id__volatile = 0; if (g_once_init_enter (&photo_monitor_reimport_master_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoMonitorReimportMasterJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_monitor_reimport_master_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoMonitorReimportMasterJob), 0, (GInstanceInitFunc) photo_monitor_reimport_master_job_instance_init, NULL }; @@ -8122,69 +8119,72 @@ static GType photo_monitor_reimport_master_job_get_type (void) { } -static void _photo_monitor_on_editable_reimported_completion_callback (BackgroundJob* job, gpointer self) { +static void +_photo_monitor_on_editable_reimported_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_on_editable_reimported ((PhotoMonitor*) self, job); #line 8126 "PhotoMonitor.c" } -static void _photo_monitor_on_editable_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +static void +_photo_monitor_on_editable_reimport_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self) +{ #line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_on_editable_reimport_cancelled ((PhotoMonitor*) self, job); -#line 8133 "PhotoMonitor.c" +#line 8136 "PhotoMonitor.c" } -static PhotoMonitorReimportEditableJob* photo_monitor_reimport_editable_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo) { +static PhotoMonitorReimportEditableJob* +photo_monitor_reimport_editable_job_construct (GType object_type, + PhotoMonitor* owner, + LibraryPhoto* photo) +{ PhotoMonitorReimportEditableJob* self = NULL; - PhotoMonitor* _tmp0_; - PhotoMonitor* _tmp1_; - GCancellable* _tmp2_; - GCancellable* _tmp3_; - PhotoMonitor* _tmp4_; - LibraryPhoto* _tmp5_; - LibraryPhoto* _tmp6_; + GCancellable* _tmp0_; + GCancellable* _tmp1_; + LibraryPhoto* _tmp2_; #line 189 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (owner), NULL); #line 189 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = owner; + _tmp0_ = g_cancellable_new (); #line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = owner; + _tmp1_ = _tmp0_; #line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = g_cancellable_new (); + self = (PhotoMonitorReimportEditableJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), _photo_monitor_on_editable_reimported_completion_callback, owner, _tmp1_, _photo_monitor_on_editable_reimport_cancelled_cancellation_callback, owner, NULL); #line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp2_; -#line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = owner; -#line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self = (PhotoMonitorReimportEditableJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _photo_monitor_on_editable_reimported_completion_callback, _tmp1_, _tmp3_, _photo_monitor_on_editable_reimport_cancelled_cancellation_callback, _tmp4_, NULL); -#line 190 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp3_); -#line 193 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; + _g_object_unref0 (_tmp1_); #line 193 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp2_ = _g_object_ref0 (photo); #line 193 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (self->photo); #line 193 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->photo = _tmp6_; + self->photo = _tmp2_; #line 189 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self; -#line 8174 "PhotoMonitor.c" +#line 8169 "PhotoMonitor.c" } -static PhotoMonitorReimportEditableJob* photo_monitor_reimport_editable_job_new (PhotoMonitor* owner, LibraryPhoto* photo) { +static PhotoMonitorReimportEditableJob* +photo_monitor_reimport_editable_job_new (PhotoMonitor* owner, + LibraryPhoto* photo) +{ #line 189 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return photo_monitor_reimport_editable_job_construct (PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, owner, photo); -#line 8181 "PhotoMonitor.c" +#line 8179 "PhotoMonitor.c" } -static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* base) { +static void +photo_monitor_reimport_editable_job_real_execute (BackgroundJob* base) +{ PhotoMonitorReimportEditableJob * self; GError * _inner_error_ = NULL; #line 196 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -8208,14 +8208,14 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 8208 "PhotoMonitor.c" - goto __catch592_g_error; + goto __catch601_g_error; } #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->success = _tmp0_; #line 8213 "PhotoMonitor.c" } - goto __finally592; - __catch592_g_error: + goto __finally601; + __catch601_g_error: { GError* err = NULL; GError* _tmp4_; @@ -8236,7 +8236,7 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas _g_error_free0 (err); #line 8235 "PhotoMonitor.c" } - __finally592: + __finally601: #line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -8250,29 +8250,35 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas } -static void photo_monitor_reimport_editable_job_class_init (PhotoMonitorReimportEditableJobClass * klass) { +static void +photo_monitor_reimport_editable_job_class_init (PhotoMonitorReimportEditableJobClass * klass) +{ #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_reimport_editable_job_parent_class = g_type_class_peek_parent (klass); #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((BackgroundJobClass *) klass)->finalize = photo_monitor_reimport_editable_job_finalize; #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) photo_monitor_reimport_editable_job_real_execute; -#line 8258 "PhotoMonitor.c" +#line 8260 "PhotoMonitor.c" } -static void photo_monitor_reimport_editable_job_instance_init (PhotoMonitorReimportEditableJob * self) { +static void +photo_monitor_reimport_editable_job_instance_init (PhotoMonitorReimportEditableJob * self) +{ #line 185 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->state = NULL; #line 186 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->success = FALSE; #line 187 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->err = NULL; -#line 8269 "PhotoMonitor.c" +#line 8273 "PhotoMonitor.c" } -static void photo_monitor_reimport_editable_job_finalize (BackgroundJob * obj) { +static void +photo_monitor_reimport_editable_job_finalize (BackgroundJob * obj) +{ PhotoMonitorReimportEditableJob * self; #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, PhotoMonitorReimportEditableJob); @@ -8284,11 +8290,13 @@ static void photo_monitor_reimport_editable_job_finalize (BackgroundJob * obj) { _g_error_free0 (self->err); #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" BACKGROUND_JOB_CLASS (photo_monitor_reimport_editable_job_parent_class)->finalize (obj); -#line 8285 "PhotoMonitor.c" +#line 8291 "PhotoMonitor.c" } -static GType photo_monitor_reimport_editable_job_get_type (void) { +static GType +photo_monitor_reimport_editable_job_get_type (void) +{ static volatile gsize photo_monitor_reimport_editable_job_type_id__volatile = 0; if (g_once_init_enter (&photo_monitor_reimport_editable_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoMonitorReimportEditableJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_monitor_reimport_editable_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoMonitorReimportEditableJob), 0, (GInstanceInitFunc) photo_monitor_reimport_editable_job_instance_init, NULL }; @@ -8300,74 +8308,77 @@ static GType photo_monitor_reimport_editable_job_get_type (void) { } -static void _photo_monitor_on_raw_development_reimported_completion_callback (BackgroundJob* job, gpointer self) { +static void +_photo_monitor_on_raw_development_reimported_completion_callback (BackgroundJob* job, + gpointer self) +{ #line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_on_raw_development_reimported ((PhotoMonitor*) self, job); -#line 8304 "PhotoMonitor.c" +#line 8315 "PhotoMonitor.c" } -static void _photo_monitor_on_raw_development_reimport_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +static void +_photo_monitor_on_raw_development_reimport_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self) +{ #line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_on_raw_development_reimport_cancelled ((PhotoMonitor*) self, job); -#line 8311 "PhotoMonitor.c" +#line 8325 "PhotoMonitor.c" } -static PhotoMonitorReimportRawDevelopmentJob* photo_monitor_reimport_raw_development_job_construct (GType object_type, PhotoMonitor* owner, LibraryPhoto* photo) { +static PhotoMonitorReimportRawDevelopmentJob* +photo_monitor_reimport_raw_development_job_construct (GType object_type, + PhotoMonitor* owner, + LibraryPhoto* photo) +{ PhotoMonitorReimportRawDevelopmentJob* self = NULL; - PhotoMonitor* _tmp0_; - PhotoMonitor* _tmp1_; - GCancellable* _tmp2_; - GCancellable* _tmp3_; - PhotoMonitor* _tmp4_; - LibraryPhoto* _tmp5_; - LibraryPhoto* _tmp6_; + GCancellable* _tmp0_; + GCancellable* _tmp1_; + LibraryPhoto* _tmp2_; #line 211 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_PHOTO_MONITOR (owner), NULL); #line 211 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" g_return_val_if_fail (IS_LIBRARY_PHOTO (photo), NULL); #line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = owner; -#line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp1_ = owner; -#line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp2_ = g_cancellable_new (); -#line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp3_ = _tmp2_; + _tmp0_ = g_cancellable_new (); #line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp4_ = owner; + _tmp1_ = _tmp0_; #line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self = (PhotoMonitorReimportRawDevelopmentJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _photo_monitor_on_raw_development_reimported_completion_callback, _tmp1_, _tmp3_, _photo_monitor_on_raw_development_reimport_cancelled_cancellation_callback, _tmp4_, NULL); + self = (PhotoMonitorReimportRawDevelopmentJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), _photo_monitor_on_raw_development_reimported_completion_callback, owner, _tmp1_, _photo_monitor_on_raw_development_reimport_cancelled_cancellation_callback, owner, NULL); #line 212 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _g_object_unref0 (_tmp3_); -#line 215 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp5_ = photo; + _g_object_unref0 (_tmp1_); #line 215 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp2_ = _g_object_ref0 (photo); #line 215 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_object_unref0 (self->photo); #line 215 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - self->photo = _tmp6_; + self->photo = _tmp2_; #line 211 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return self; -#line 8352 "PhotoMonitor.c" +#line 8358 "PhotoMonitor.c" } -static PhotoMonitorReimportRawDevelopmentJob* photo_monitor_reimport_raw_development_job_new (PhotoMonitor* owner, LibraryPhoto* photo) { +static PhotoMonitorReimportRawDevelopmentJob* +photo_monitor_reimport_raw_development_job_new (PhotoMonitor* owner, + LibraryPhoto* photo) +{ #line 211 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return photo_monitor_reimport_raw_development_job_construct (PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, owner, photo); -#line 8359 "PhotoMonitor.c" +#line 8368 "PhotoMonitor.c" } -static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJob* base) { +static void +photo_monitor_reimport_raw_development_job_real_execute (BackgroundJob* base) +{ PhotoMonitorReimportRawDevelopmentJob * self; GError * _inner_error_ = NULL; #line 218 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, PhotoMonitorReimportRawDevelopmentJob); -#line 8368 "PhotoMonitor.c" +#line 8379 "PhotoMonitor.c" { gboolean _tmp0_ = FALSE; LibraryPhoto* _tmp1_; @@ -8385,15 +8396,15 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ _tmp0_ = _tmp3_; #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8386 "PhotoMonitor.c" - goto __catch593_g_error; +#line 8397 "PhotoMonitor.c" + goto __catch602_g_error; } #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->success = _tmp0_; -#line 8391 "PhotoMonitor.c" +#line 8402 "PhotoMonitor.c" } - goto __finally593; - __catch593_g_error: + goto __finally602; + __catch602_g_error: { GError* err = NULL; GError* _tmp4_; @@ -8412,9 +8423,9 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ self->err = _tmp5_; #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" _g_error_free0 (err); -#line 8413 "PhotoMonitor.c" +#line 8424 "PhotoMonitor.c" } - __finally593: + __finally602: #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -8423,34 +8434,40 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ g_clear_error (&_inner_error_); #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" return; -#line 8424 "PhotoMonitor.c" +#line 8435 "PhotoMonitor.c" } } -static void photo_monitor_reimport_raw_development_job_class_init (PhotoMonitorReimportRawDevelopmentJobClass * klass) { +static void +photo_monitor_reimport_raw_development_job_class_init (PhotoMonitorReimportRawDevelopmentJobClass * klass) +{ #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_reimport_raw_development_job_parent_class = g_type_class_peek_parent (klass); #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((BackgroundJobClass *) klass)->finalize = photo_monitor_reimport_raw_development_job_finalize; #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) photo_monitor_reimport_raw_development_job_real_execute; -#line 8436 "PhotoMonitor.c" +#line 8449 "PhotoMonitor.c" } -static void photo_monitor_reimport_raw_development_job_instance_init (PhotoMonitorReimportRawDevelopmentJob * self) { +static void +photo_monitor_reimport_raw_development_job_instance_init (PhotoMonitorReimportRawDevelopmentJob * self) +{ #line 207 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->state = NULL; #line 208 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->success = FALSE; #line 209 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->err = NULL; -#line 8447 "PhotoMonitor.c" +#line 8462 "PhotoMonitor.c" } -static void photo_monitor_reimport_raw_development_job_finalize (BackgroundJob * obj) { +static void +photo_monitor_reimport_raw_development_job_finalize (BackgroundJob * obj) +{ PhotoMonitorReimportRawDevelopmentJob * self; #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, PhotoMonitorReimportRawDevelopmentJob); @@ -8462,11 +8479,13 @@ static void photo_monitor_reimport_raw_development_job_finalize (BackgroundJob * _g_error_free0 (self->err); #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" BACKGROUND_JOB_CLASS (photo_monitor_reimport_raw_development_job_parent_class)->finalize (obj); -#line 8463 "PhotoMonitor.c" +#line 8480 "PhotoMonitor.c" } -static GType photo_monitor_reimport_raw_development_job_get_type (void) { +static GType +photo_monitor_reimport_raw_development_job_get_type (void) +{ static volatile gsize photo_monitor_reimport_raw_development_job_type_id__volatile = 0; if (g_once_init_enter (&photo_monitor_reimport_raw_development_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoMonitorReimportRawDevelopmentJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_monitor_reimport_raw_development_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoMonitorReimportRawDevelopmentJob), 0, (GInstanceInitFunc) photo_monitor_reimport_raw_development_job_instance_init, NULL }; @@ -8478,7 +8497,9 @@ static GType photo_monitor_reimport_raw_development_job_get_type (void) { } -static void photo_monitor_class_init (PhotoMonitorClass * klass) { +static void +photo_monitor_class_init (PhotoMonitorClass * klass) +{ #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" photo_monitor_parent_class = g_type_class_peek_parent (klass); #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" @@ -8519,11 +8540,13 @@ static void photo_monitor_class_init (PhotoMonitorClass * klass) { ((MediaMonitorClass *) klass)->process_updates = (void (*) (MediaMonitor *, GeeCollection*, TransactionController*, gint*, GError**)) photo_monitor_real_process_updates; #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" G_OBJECT_CLASS (klass)->finalize = photo_monitor_finalize; -#line 8520 "PhotoMonitor.c" +#line 8541 "PhotoMonitor.c" } -static void photo_monitor_instance_init (PhotoMonitor * self) { +static void +photo_monitor_instance_init (PhotoMonitor * self) +{ GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; GeeHashMap* _tmp2_; @@ -8551,11 +8574,13 @@ static void photo_monitor_instance_init (PhotoMonitor * self) { _tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 234 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->priv->raw_developments_reimport_pending = _tmp4_; -#line 8552 "PhotoMonitor.c" +#line 8575 "PhotoMonitor.c" } -static void photo_monitor_finalize (GObject * obj) { +static void +photo_monitor_finalize (GObject * obj) +{ PhotoMonitor * self; #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_MONITOR, PhotoMonitor); @@ -8573,11 +8598,13 @@ static void photo_monitor_finalize (GObject * obj) { _g_object_unref0 (self->priv->raw_developments_reimport_pending); #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" G_OBJECT_CLASS (photo_monitor_parent_class)->finalize (obj); -#line 8574 "PhotoMonitor.c" +#line 8599 "PhotoMonitor.c" } -GType photo_monitor_get_type (void) { +GType +photo_monitor_get_type (void) +{ static volatile gsize photo_monitor_type_id__volatile = 0; if (g_once_init_enter (&photo_monitor_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoMonitorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_monitor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoMonitor), 0, (GInstanceInitFunc) photo_monitor_instance_init, NULL }; @@ -8589,7 +8616,11 @@ GType photo_monitor_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) { @@ -8601,7 +8632,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); } |